CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <[EMAIL PROTECTED]> 04/09/12 02:41:56
Modified files:
src : game_events.cpp
Log message:
fixed bug with [not] tags in filters
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.100 wesnoth/src/game_events.cpp:1.101
--- wesnoth/src/game_events.cpp:1.100 Sat Aug 28 23:23:05 2004
+++ wesnoth/src/game_events.cpp Sun Sep 12 02:41:56 2004
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.100 2004/08/28 23:23:05 isaaccp Exp $ */
+/* $Id: game_events.cpp,v 1.101 2004/09/12 02:41:56 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1269,7 +1269,7 @@
//iterate over any [not] tags, and if any match, then the filter does
not match
const config::child_list& negatives = cfg.get_children("not");
for(config::child_list::const_iterator i = negatives.begin(); i !=
negatives.end(); ++i) {
- if((cfg["x"] != "" || cfg["y"] != "") && filter_loc(loc,**i)) {
+ if(((**i)["x"] != "" || (**i)["y"] != "") &&
filter_loc(loc,**i)) {
return false;
}
}