upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 19:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix an omission in the lazy evaluation code:

Browse Source 
non recall units should be auto-stored inside unit::matches_filter()
This commit is contained in:
Patrick Parker 2007-02-24 21:02:54 +00:00
parent 58afd2bf0c
commit e6a4ee4035
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/unit.cpp
View File

@ -736,6 +736,17 @@ bool unit::has_ability_by_id(const std::string& ability) const
}
bool unit::matches_filter(const config& orig_cfg,const gamemap::location& loc, bool use_flat_tod) const
{
scoped_wml_variable* auto_store;
if(map_ != NULL && loc.valid() && units_ != NULL) {
auto_store = new scoped_xy_unit("this_unit", loc.x, loc.y, *units_);
}
bool to_return = internal_matches_filter(orig_cfg, loc, use_flat_tod);
delete auto_store;
return to_return;
}
bool unit::internal_matches_filter(const config& orig_cfg,const gamemap::location& loc, bool use_flat_tod) const
{
vconfig tmp_vconf(&orig_cfg);
config cfg = tmp_vconf.get_parsed_config();
@ -847,9 +858,10 @@ bool unit::matches_filter(const config& orig_cfg,const gamemap::location& loc, b
}
}
if(!has_weapon)
if(!has_weapon) {
return false;
}
}
if(role.empty() == false && role_ != role) {
return false;
@ -859,8 +871,9 @@ bool unit::matches_filter(const config& orig_cfg,const gamemap::location& loc, b
return false;
}
if (canrecruit.empty() == false && (canrecruit == "1") != can_recruit())
if (canrecruit.empty() == false && (canrecruit == "1") != can_recruit()) {
return false;
}
if(level.empty() == false && level_ != lexical_cast_default<int>(level,-1)) {
return false;
@ -870,7 +883,7 @@ bool unit::matches_filter(const config& orig_cfg,const gamemap::location& loc, b
//should not match if what is in the [not] tag does match
const config::child_list& negatives = cfg.get_children("not");
for(config::child_list::const_iterator not_it = negatives.begin(); not_it != negatives.end(); ++not_it) {
if(matches_filter(**not_it,loc)) {
if(internal_matches_filter(**not_it,loc,use_flat_tod)) {
return false;
}
}
@ -885,10 +898,11 @@ bool unit::matches_filter(const config& orig_cfg,const gamemap::location& loc, b
write(unit_cfg);
//now, match the kids, WML based
for(config::const_child_iterator i = my_range.first; i != my_range.second; ++i) {
if(!unit_cfg.matches(**i)) return false;
if(!unit_cfg.matches(**i)) {
return false;
}
}
}
return true;
}

2
src/unit.hpp
View File

@ -299,6 +299,8 @@ class unit
private:
bool internal_matches_filter(const config& cfg,const gamemap::location& loc,
bool use_flat_tod) const;
/*
* cfg: an ability WML structure
*/