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

fix random errors and OOS in events

Browse source 
fixes issue #4946
This commit is contained in:
gfgtdf 2020-06-10 20:06:28 +02:00
parent 5dcda03ee9
commit f4538f6b02
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game_events/wmi_manager.cpp
View file

@ -87,6 +87,8 @@ bool wmi_manager::fire_item(
}
// Prepare for can show().
config::attribute_value x1 = gamedata.get_variable("x1");
config::attribute_value y1 = gamedata.get_variable("y1");
gamedata.get_variable("x1") = hex.wml_x();
gamedata.get_variable("y1") = hex.wml_y();
scoped_xy_unit highlighted_unit("unit", hex, units);
@ -95,6 +97,8 @@ bool wmi_manager::fire_item(
if(wmi->can_show(hex, gamedata, fc)) {
wmi->fire_event(hex, gamedata);
}
gamedata.get_variable("x1") = x1;
gamedata.get_variable("y1") = y1;
return true;
}
@ -117,6 +121,10 @@ void wmi_manager::get_items(const map_location& hex,
}
// Prepare for can show().
config::attribute_value x1 = gamedata.get_variable("x1");
config::attribute_value y1 = gamedata.get_variable("y1");
gamedata.get_variable("x1") = hex.wml_x();
gamedata.get_variable("y1") = hex.wml_y();
scoped_xy_unit highlighted_unit("unit", hex, units);
@ -133,6 +141,8 @@ void wmi_manager::get_items(const map_location& hex,
descriptions.emplace_back("id", item->menu_text());
}
}
gamedata.get_variable("x1") = x1;
gamedata.get_variable("y1") = y1;
}
wmi_manager::item_ptr wmi_manager::get_item(const std::string& id) const