CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: John McNabb <[EMAIL PROTECTED]> 05/08/26 15:21:46
Modified files:
src : actions.cpp
data : traits.cfg
Log message:
fixed amla healing bug
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.237&tr2=1.238&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/traits.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: wesnoth/data/traits.cfg
diff -u wesnoth/data/traits.cfg:1.4 wesnoth/data/traits.cfg:1.5
--- wesnoth/data/traits.cfg:1.4 Mon May 30 07:47:54 2005
+++ wesnoth/data/traits.cfg Fri Aug 26 15:21:46 2005
@@ -31,7 +31,6 @@
[effect]
apply_to=hitpoints
increase_total=2
- heal_full=yes
[/effect]
[/trait]
#enddef
@@ -59,7 +58,6 @@
[effect]
apply_to=hitpoints
increase_total=-10%
- heal_full=yes
[/effect]
[/trait]
#enddef
@@ -82,8 +80,6 @@
[effect]
apply_to=hitpoints
increase_total=7
- #make sure the unit starts at full health
- heal_full=yes
[/effect]
[/trait]
#enddef
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.237 wesnoth/src/actions.cpp:1.238
--- wesnoth/src/actions.cpp:1.237 Sun Aug 21 17:27:15 2005
+++ wesnoth/src/actions.cpp Fri Aug 26 15:21:46 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.237 2005/08/21 17:27:15 gruikya Exp $ */
+/* $Id: actions.cpp,v 1.238 2005/08/26 15:21:46 darthfool Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -141,6 +141,7 @@
new_unit.set_movement(0);
new_unit.set_attacked();
}
+ new_unit.heal_all();
const bool show = disp != NULL && !disp->turbo() &&
!disp->fogged(recruit_location.x,recruit_location.y);
