Author: tschmitz
Date: Mon Aug 22 12:07:01 2011
New Revision: 50877
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50877&view=rev
Log:
Fixed bug with out-of-turn planning (from multi-turn moves commit).
Modified:
trunk/src/whiteboard/mapbuilder.cpp
Modified: trunk/src/whiteboard/mapbuilder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/mapbuilder.cpp?rev=50877&r1=50876&r2=50877&view=diff
==============================================================================
--- trunk/src/whiteboard/mapbuilder.cpp (original)
+++ trunk/src/whiteboard/mapbuilder.cpp Mon Aug 22 12:07:01 2011
@@ -51,9 +51,11 @@
int current_side = resources::controller->current_side();
foreach(unit& u, *resources::units)
{
- resetters_.push_back(new unit_movement_resetter(u,false));
- //make sure current team's units are not reset to full moves on
first turn
- if(u.side() == current_side)
+ bool on_current_side = (u.side() == current_side);
+ //restore movement points only to units not on the current side
+ resetters_.push_back(new
unit_movement_resetter(u,!on_current_side));
+ //make sure current side's units are not reset to full moves on
first turn
+ if(on_current_side)
acted_this_turn_.insert(&u);
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
