[Wesnoth-cvs-commits] wesnoth/src game_events.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <[EMAIL PROTECTED]>  05/04/01 13:41:11

Modified files:
        src            : game_events.cpp 

Log message:
        Fixed bug #12526

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.140&tr2=1.141&r1=text&r2=text

Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.140 wesnoth/src/game_events.cpp:1.141
--- wesnoth/src/game_events.cpp:1.140   Mon Mar 28 15:00:13 2005
+++ wesnoth/src/game_events.cpp Fri Apr  1 13:41:10 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.140 2005/03/28 15:00:13 gruikya Exp $ */
+/* $Id: game_events.cpp,v 1.141 2005/04/01 13:41:10 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -313,8 +313,13 @@
        else if(cmd == "unstone") {
                const vconfig filter = cfg.child("filter");
                for(unit_map::iterator i = units->begin(); i != units->end(); 
++i) {
-                       if(i->second.stone() && (!filter.null() || 
game_events::unit_matches_filter(i, filter))) {
-                               i->second.remove_flag("stone");
+                       if(i->second.stone()) {
+                               if(!filter.null()) {
+                                       if(game_events::unit_matches_filter(i, 
filter))
+                                               i->second.remove_flag("stone");
+                               } else {
+                                       i->second.remove_flag("stone");
+                               }
                        }
                }
        }