Author: ai0867
Date: Thu Jun 25 00:59:53 2009
New Revision: 36397
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36397&view=rev
Log:
Port r36395 from trunk:
Petrified units no longer heal. (bug #13513)
Modified:
branches/1.6/changelog
branches/1.6/src/actions.cpp
Modified: branches/1.6/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/changelog?rev=36397&r1=36396&r2=36397&view=diff
==============================================================================
--- branches/1.6/changelog (original)
+++ branches/1.6/changelog Thu Jun 25 00:59:53 2009
@@ -1,7 +1,8 @@
Version 1.6.3+svn:
* Language and translations
* Updated translations: French, Swedish
- * Miscellaneous and bugfixes:
+ * WML Engine
+ * Petrified units no longer heal. (bug #13513) * Miscellaneous and
bugfixes:
* Properly translate dialog title (bug #13761)
* Properly translate unit name and mark strings translatable (bug #13751)
Modified: branches/1.6/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/actions.cpp?rev=36397&r1=36396&r2=36397&view=diff
==============================================================================
--- branches/1.6/src/actions.cpp (original)
+++ branches/1.6/src/actions.cpp Thu Jun 25 00:59:53 2009
@@ -1681,7 +1681,8 @@
// We look for all allied units, then we see if our healer is near them.
for (unit_map::iterator i = units.begin(); i != units.end(); ++i) {
- if (!utils::string_bool(i->second.get_state("healable"),true))
+ if (!utils::string_bool(i->second.get_state("healable"),true) ||
+ i->second.incapacitated())
continue;
DBG_NG << "found healable unit at (" << i->first << ")\n";
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
