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

[John McNabb]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     John McNabb <address@hidden>    05/07/05 13:42:45

Modified files:
        src            : unit.cpp 

Log message:
        after max level advancements

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

Patches:
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.155 wesnoth/src/unit.cpp:1.156
--- wesnoth/src/unit.cpp:1.155  Sat Jul  2 21:37:19 2005
+++ wesnoth/src/unit.cpp        Tue Jul  5 13:42:45 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.155 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: unit.cpp,v 1.156 2005/07/05 13:42:45 darthfool Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -119,7 +119,7 @@
        gender_(u.gender_), variation_(u.variation_),
        type_(&t->get_gender_unit_type(u.gender_).get_variation(u.variation_)),
        state_(STATE_NORMAL),
-       hitpoints_(type_->hitpoints()),
+       hitpoints_(u.hitpoints()),
        maxHitpoints_(type_->hitpoints()),
        backupMaxHitpoints_(type_->hitpoints()),
        experience_(0),
@@ -144,7 +144,9 @@
 
        //apply modifications etc, refresh the unit
        apply_modifications();
-       heal_all();
+       if(u.type().id()!=t->id()){
+         heal_all();
+       }
        statusFlags_.clear();
 }