Author: ai0867
Date: Fri Sep 26 16:24:49 2008
New Revision: 29690
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29690&view=rev
Log:
* Remove obsolete WML.
Modified:
trunk/src/game_events.cpp
trunk/src/unit_types.cpp
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=29690&r1=29689&r2=29690&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Fri Sep 26 16:24:49 2008
@@ -1676,9 +1676,6 @@
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);
Modified: trunk/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.cpp?rev=29690&r1=29689&r2=29690&view=diff
==============================================================================
--- trunk/src/unit_types.cpp (original)
+++ trunk/src/unit_types.cpp Fri Sep 26 16:24:49 2008
@@ -106,16 +106,11 @@
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;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
