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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/02/03 19:37:32

Modified files:
        src            : actions.cpp 

Log message:
        Remove asserted triviality and leaderless-removal code.

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

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.188 wesnoth/src/actions.cpp:1.189
--- wesnoth/src/actions.cpp:1.188       Sun Jan 30 03:46:48 2005
+++ wesnoth/src/actions.cpp     Thu Feb  3 19:37:29 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.188 2005/01/30 03:46:48 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.189 2005/02/03 19:37:29 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1333,7 +1333,7 @@
                        }
                }
 
-               if (side < teams.size() && (teams[side].is_human() || 
teams[side].is_persistent())) {
+               if (teams[side].is_human() || teams[side].is_persistent()) {
                        found_player = true;
                }
        }
@@ -1360,19 +1360,6 @@
                LOG_NG << "throwing end level exception...\n";
                throw end_level_exception(found_player ? VICTORY : DEFEAT);
        }
-
-       //remove any units which are leaderless
-       //this code currently removed, to try not removing leaderless enemies
-       /*
-       std::map<gamemap::location,unit>::iterator j = units.begin();
-       while(j != units.end()) {
-               
if(std::find(seen_leaders.begin(),seen_leaders.end(),j->second.side()) == 
seen_leaders.end()) {
-                       units.erase(j);
-                       j = units.begin();
-               } else {
-                       ++j;
-               }
-       }*/
 }
 
 const time_of_day& timeofday_at(const gamestatus& status,const unit_map& 
units,const gamemap::location& loc)