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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <[EMAIL PROTECTED]> 04/10/04 00:19:17

Modified files:
        src            : game.cpp 

Log message:
        fixed bug where playing mp and then playing a campaign could load the 
mp game up again

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

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.140 wesnoth/src/game.cpp:1.141
--- wesnoth/src/game.cpp:1.140  Tue Sep 28 23:40:07 2004
+++ wesnoth/src/game.cpp        Mon Oct  4 00:19:16 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.140 2004/09/28 23:40:07 Sirp Exp $ */
+/* $Id: game.cpp,v 1.141 2004/10/04 00:19:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -609,6 +609,8 @@
 
 bool game_controller::play_multiplayer_mode()
 {
+       state_ = game_state();
+
        if(!multiplayer_mode_) {
                return true;
        }
@@ -772,6 +774,8 @@
 
 bool game_controller::load_game()
 {
+       state_ = game_state();
+
        bool show_replay = loaded_game_show_replay_;
 
        const std::string game = loaded_game_.empty() ? 
dialogs::load_game_dialog(disp(),game_config_,units_data_,&show_replay) : 
loaded_game_;
@@ -887,6 +891,8 @@
 
 bool game_controller::new_campaign()
 {
+       state_ = game_state();
+
        state_.campaign_type = "scenario";
 
        config::child_list campaigns = game_config_.get_children("campaign");