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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/10/30 21:00:26

Modified files:
        src            : playturn.cpp 

Log message:
        fixed possible assertion failure

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

Patches:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.280 wesnoth/src/playturn.cpp:1.281
--- wesnoth/src/playturn.cpp:1.280      Wed Oct 27 20:42:36 2004
+++ wesnoth/src/playturn.cpp    Sat Oct 30 21:00:26 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.280 2004/10/27 20:42:36 gruikya Exp $ */
+/* $Id: playturn.cpp,v 1.281 2004/10/30 21:00:26 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -554,7 +554,7 @@
        unit_map::iterator enemy = find_unit(hex);
 
        //see if we're trying to attack an enemy
-       if(route != current_paths_.routes.end() && enemy != units_.end() &&
+       if(u != units_.end() && route != current_paths_.routes.end() && enemy 
!= units_.end() &&
           hex != selected_hex_ && !browse_ &&
           enemy->second.side() != u->second.side() &&
           current_team.is_enemy(enemy->second.side())) {