[Wesnoth-cvs-commits] wesnoth/src unit.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/05/19 17:45:50

Modified files:
        src            : unit.cpp 

Log message:
        Fix wrong initialization order in the 'unit' constructors.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.152&tr2=1.153&r1=text&r2=text

Patches:
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.152 wesnoth/src/unit.cpp:1.153
--- wesnoth/src/unit.cpp:1.152  Wed May 18 14:06:30 2005
+++ wesnoth/src/unit.cpp        Thu May 19 17:45:49 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.152 2005/05/18 14:06:30 darthfool Exp $ */
+/* $Id: unit.cpp,v 1.153 2005/05/19 17:45:49 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -67,10 +67,8 @@
 unit::unit(const game_data& data, const config& cfg) : 
        state_(STATE_NORMAL),
        moves_(0), user_end_turn_(false), facingLeft_(true),
-       resting_(false),
-       recruit_(false),
-       guardian_(false), upkeep_(UPKEEP_FREE),
-       hold_position_(false)
+       resting_(false), hold_position_(false), recruit_(false),
+       guardian_(false), upkeep_(UPKEEP_FREE)
 {
        read(data,cfg);
 }
@@ -98,8 +96,8 @@
               user_end_turn_(false), facingLeft_(side != 1),
               maxMovement_(type_->movement()),
               backupMaxMovement_(type_->movement()),
-              resting_(false), recruit_(false), attacks_(type_->attacks()),
-              hold_position_(false),
+              resting_(false), hold_position_(false), recruit_(false),
+              attacks_(type_->attacks()),
               backupAttacks_(type_->attacks()),
                guardian_(false), upkeep_(UPKEEP_FULL_PRICE),
                unrenamable_(false)
@@ -127,12 +125,11 @@
        experience_(0),
        maxExperience_(type_->experience_needed()),
        backupMaxExperience_(type_->experience_needed()),
-       hold_position_(u.hold_position_),
        side_(u.side()), moves_(u.moves_),
        user_end_turn_(false), facingLeft_(u.facingLeft_),
        maxMovement_(type_->movement()),
        backupMaxMovement_(type_->movement()),
-       resting_(u.resting_),
+       resting_(u.resting_), hold_position_(u.hold_position_),
        underlying_description_(u.underlying_description_),
        description_(u.description_), recruit_(u.recruit_),
        role_(u.role_), statusFlags_(u.statusFlags_),