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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <[EMAIL PROTECTED]> 05/05/28 23:02:21

Modified files:
        src            : playcampaign.cpp 

Log message:
        removed erroneous assertion which triggered in mp games

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

Patches:
Index: wesnoth/src/playcampaign.cpp
diff -u wesnoth/src/playcampaign.cpp:1.3 wesnoth/src/playcampaign.cpp:1.4
--- wesnoth/src/playcampaign.cpp:1.3    Mon May 16 22:44:19 2005
+++ wesnoth/src/playcampaign.cpp        Sat May 28 23:02:21 2005
@@ -1,4 +1,4 @@
-/* $Id: playcampaign.cpp,v 1.3 2005/05/16 22:44:19 ydirson Exp $ */
+/* $Id: playcampaign.cpp,v 1.4 2005/05/28 23:02:21 Sirp Exp $ */
 /*
    Copyright (C) 2003-2005 by David White <[EMAIL PROTECTED]>
    Copyright (C) 2005 by Philippe Plantier <[EMAIL PROTECTED]>
@@ -207,11 +207,9 @@
                                starting_pos = (*cfg.child("next_scenario"));
                                scenario = &starting_pos;
                                state = read_game(units_data, scenario);
-                       } else if(scenario->child("end_scenarios")) {
+                       } else  {
                                scenario = NULL;
                                state.scenario = "null";
-                       } else {
-                               wassert(false);
                        }
 
                } else {