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

Remove deprecated 'weapon' attributes in [fire_event].

Browse Source
This commit is contained in:
Alexander van Gessel 2008-10-05 17:38:25 +01:00
parent 547f860a39
commit 3b08450523
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game_events.cpp
View File

@ -2147,32 +2147,16 @@ namespace {
vconfig u = cfg.child("primary_unit");
if (u.has_attribute("x") && u.has_attribute("y"))
loc1 = cfg_to_loc(u);
if (u.has_attribute("weapon")) {
lg::wml_error << "weapon= in [fire_event] has been deprecated; support for this will be removed in 1.5.5\n";
config& f = data.add_child("first");
f["name"] = u.get_attribute("weapon");
}
}
if (cfg.has_child("primary_attack")) {
// mixing this with deprecated [primary_unit] weapon= above may
// cause undefined behavior!
data.add_child("first", cfg.child("primary_attack").get_parsed_config());
}
if (cfg.has_child("secondary_unit")) {
vconfig u = cfg.child("secondary_unit");
if (u.has_attribute("x") && u.has_attribute("y"))
loc2 = cfg_to_loc(u);
if (u.has_attribute("weapon")) {
lg::wml_error << "weapon= in [fire_event] has been deprecated; support for this will be removed in 1.5.5\n";
config& s = data.add_child("second");
s["name"] = u.get_attribute("weapon");
}
}
if (cfg.has_child("secondary_attack")) {
// mixing this with deprecated [secondary_unit] weapon= above may
// cause undefined behavior!
data.add_child("second", cfg.child("secondary_attack").get_parsed_config());
}
game_events::fire(cfg["name"],loc1,loc2,data);