Author: ai0867
Date: Tue Sep 16 23:04:44 2008
New Revision: 29501
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29501&view=rev
Log:
* Remove obsolete compatibility code.
Modified:
trunk/src/unit.cpp
trunk/src/unit_animation.cpp
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=29501&r1=29500&r2=29501&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Tue Sep 16 23:04:44 2008
@@ -1254,18 +1254,6 @@
}
}
}
- // FIXME OBSOLETE: Remove in 1.5.3
- const vconfig::child_list& wmlcfgs_old = cfg.get_children("wml_filter");
- if (!wmlcfgs_old.empty()) {
- config unit_cfg;
- write(unit_cfg);
- // Now, match the kids, WML based
- for(unsigned int i=0; i < wmlcfgs_old.size(); ++i) {
-
if(!unit_cfg.matches(wmlcfgs_old[i].get_parsed_config())) {
- return false;
- }
- }
- }
if (cfg.has_child("filter_vision")) {
const vconfig::child_list& vis_filt =
cfg.get_children("filter_vision");
@@ -1607,8 +1595,7 @@
} else if(cfg["type"]=="") {
alignment_ = unit_type::NEUTRAL;
}
- // FIXME OBSOLETE Remove in 1.5.3
- if(utils::string_bool(cfg["generate_name"]) ||
utils::string_bool(cfg["generate_description"])) {
+ if(utils::string_bool(cfg["generate_name"])) {
name_ = generate_name(state ? &(state->rng()) : 0);
cfg_["generate_name"] = "";
}
Modified: trunk/src/unit_animation.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_animation.cpp?rev=29501&r1=29500&r2=29501&view=diff
==============================================================================
--- trunk/src/unit_animation.cpp (original)
+++ trunk/src/unit_animation.cpp Tue Sep 16 23:04:44 2008
@@ -179,16 +179,8 @@
for(itor = cfg.child_range("filter").first; itor
<cfg.child_range("filter").second;itor++) {
unit_filter_.push_back(**itor);
}
- // FIXME OBSOLETE: Remove in 1.5.3
- for(itor = cfg.child_range("unit_filter").first; itor
<cfg.child_range("unit_filter").second;itor++) {
- unit_filter_.push_back(**itor);
- }
for(itor = cfg.child_range("secondary_unit_filter").first; itor
<cfg.child_range("secondary_unit_filter").second;itor++) {
- secondary_unit_filter_.push_back(**itor);
- }
- // FIXME OBSOLETE: Remove in 1.5.3
- for(itor = cfg.child_range("filter_second").first; itor
<cfg.child_range("filter_second").second;itor++) {
secondary_unit_filter_.push_back(**itor);
}
frequency_ = atoi(cfg["frequency"].c_str());
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
