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

Prevent a bug if [recall] is used on a valid, but unusable location...

Browse source 
...and no usable location can be found.
This commit is contained in:
Alexander van Gessel 2011-11-05 01:32:54 +01:00
parent d0e16cd4c4
commit 8c09e8b11f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game_events.cpp
View file

@ -1835,12 +1835,15 @@ WML_HANDLER_FUNCTION(recall, /*event_info*/, cfg)
if(pass_check || (resources::units->count(loc) > 0))
loc = pathfind::find_vacant_tile(*resources::game_map,
*resources::units, loc, pathfind::VACANT_ANY, pass_check);
DBG_NG << "No usable leader found, but found usable location. Recalling.\n";
avail.erase(u); // Erase before recruiting, since recruiting can fire more events
map_location null_location = map_location::null_location;
place_recruit(to_recruit, loc, null_location, true,
cfg["show"].to_bool(true), cfg["fire_event"].to_bool(false), true, true);
return;
// Check if we still have a valid location
if (resources::game_map->on_board(loc)) {
DBG_NG << "No usable leader found, but found usable location. Recalling.\n";
avail.erase(u); // Erase before recruiting, since recruiting can fire more events
map_location null_location = map_location::null_location;
place_recruit(to_recruit, loc, null_location, true,
cfg["show"].to_bool(true), cfg["fire_event"].to_bool(false), true, true);
return;
}
}
}
}