0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-10-26 01:04:15 -04:00
commit e7db876b3a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/saved_game.cpp
View file

@ -511,9 +511,10 @@ void saved_game::cancel_orders()
{
BOOST_FOREACH(config &side, this->starting_pos_.child_range("side"))
{
// TODO: was this line needed, was it just an optimisation, or was ist just wrong?
// if (side["controller"] != "human") continue;
// reenable it iff it was needed for some reason but please explain why.
// for humans "goto_x/y" is used for multi-turn-moves
// for the ai "goto_x/y" is a way for wml to order the ai to move a unit to a certain place.
// we want to cancel human order but not to break wml.
if (side["controller"] != "human" && side["controller"] != "network") continue;
BOOST_FOREACH(config &unit, side.child_range("unit"))
{
unit["goto_x"] = -999;