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

don't parse the vconfig before calling unit::matches_filter

Browse source
This commit is contained in:
Patrick Parker 2007-03-17 22:49:36 +00:00
parent 37e7f0da49
commit c971c69f58
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game_events.cpp
View file

@ -2246,7 +2246,7 @@ bool matches_special_filter(const config* cfg, const vconfig filter)
bool unit_matches_filter(const unit& u, const vconfig filter,const gamemap::location& loc) bool unit_matches_filter(const unit& u, const vconfig filter,const gamemap::location& loc)
{ {
const bool res = u.matches_filter(filter.get_parsed_config(),loc); const bool res = u.matches_filter(filter.get_config(),loc);
if(res == true) { if(res == true) {
const vconfig::child_list& nots = filter.get_children("not"); const vconfig::child_list& nots = filter.get_children("not");
for(vconfig::child_list::const_iterator i = nots.begin(); i != nots.end(); ++i) { for(vconfig::child_list::const_iterator i = nots.begin(); i != nots.end(); ++i) {
@ -2261,7 +2261,7 @@ bool unit_matches_filter(const unit& u, const vconfig filter,const gamemap::loca
bool unit_matches_filter(unit_map::const_iterator itor, const vconfig filter) bool unit_matches_filter(unit_map::const_iterator itor, const vconfig filter)
{ {
const bool res = filter_loc(itor->first,filter) && itor->second.matches_filter(filter.get_parsed_config(),itor->first); const bool res = filter_loc(itor->first,filter) && itor->second.matches_filter(filter.get_config(),itor->first);
if(res == true) { if(res == true) {
const vconfig::child_list& nots = filter.get_children("not"); const vconfig::child_list& nots = filter.get_children("not");
for(vconfig::child_list::const_iterator i = nots.begin(); i != nots.end(); ++i) { for(vconfig::child_list::const_iterator i = nots.begin(); i != nots.end(); ++i) {