upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 23:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Support location_id in [recall] and [unstore_unit]

Browse Source 
(cherry-picked from commit ea6578a87a4806500ec482cd179c565019c548fb)
This commit is contained in:
Celtic Minstrel 2018-04-16 00:49:28 -04:00
parent 48123469bc
commit 6d322cf63c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/game_events/action_wml.cpp
View File

@ -495,9 +495,14 @@ WML_HANDLER_FUNCTION(recall,, cfg)
const unit_ptr to_recruit = *u;
const unit* pass_check = to_recruit.get();
if(!cfg["check_passability"].to_bool(true)) pass_check = nullptr;
const map_location cfg_loc = cfg.has_attribute("location_id")
? resources::gameboard->map().special_locations().left[cfg["location_id"]]
: cfg_to_loc(cfg);
map_location cfg_loc = cfg_to_loc(cfg);
if(cfg.has_attribute("location_id")) {
const auto& special_locs = resources::gameboard->map().special_locations().left;
auto& iter = special_locs.find(cfg["location_id"])
if(iter != special_locs.end()) {
cfg_loc = iter->second;
}
}
/// @todo fendrin: comment this monster
for (unit_map::const_unit_iterator leader : leaders) {