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

Remove obsolete WML.

Browse source
This commit is contained in:
Alexander van Gessel 2008-09-26 15:24:49 +01:00
parent 5deeb0b404
commit fa59a12469
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game_events.cpp
View file

@ -1676,9 +1676,6 @@ namespace {
const std::vector<gamemap::location> locs = multiple_locs(cfg);
std::string terrain_type = cfg["terrain"];
// FIXME: OBSOLETE Remove this in 1.5
if (terrain_type.empty())
terrain_type = cfg["letter"];
assert(state_of_game != NULL);
t_translation::t_terrain terrain = t_translation::read_terrain_code(terrain_type);

7
src/unit_types.cpp
View file

@ -106,16 +106,11 @@ std::string attack_type::accuracy_parry_description() const
bool attack_type::matches_filter(const config& cfg,bool self) const
{
const bool deprecated_style = cfg["name"].empty() && !cfg["weapon"].empty();
const std::vector<std::string>& filter_range = utils::split(cfg["range"]);
const std::vector<std::string> filter_name = !deprecated_style ? utils::split(cfg["name"]) : utils::split(cfg["weapon"]);
const std::vector<std::string> filter_name = utils::split(cfg["name"]);
const std::vector<std::string> filter_type = utils::split(cfg["type"]);
const std::string filter_special = cfg["special"];
if(deprecated_style)
lg::wml_error << "deprecated 'weapon' attribute in attack filter; support for this will be removed in 1.5.5 (use 'name' instead)\n";
if(filter_range.empty() == false && std::find(filter_range.begin(),filter_range.end(),range()) == filter_range.end())
return false;