[Wesnoth-cvs-commits] wesnoth/src multiplayer_connect.cpp multiplayer...

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/23 12:52:38

Modified files:
        src            : multiplayer_connect.cpp multiplayer_wait.cpp 

Log message:
        Applied patch #3850 from cyberjack fixes bug #12306: Loading mp games 
doesn't load stats.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.130&tr2=1.131&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.130 
wesnoth/src/multiplayer_connect.cpp:1.131
--- wesnoth/src/multiplayer_connect.cpp:1.130   Sat Mar 19 21:04:46 2005
+++ wesnoth/src/multiplayer_connect.cpp Wed Mar 23 12:52:38 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.130 2005/03/19 21:04:46 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.131 2005/03/23 12:52:38 j_daniel Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -20,6 +20,7 @@
 #include "multiplayer_connect.hpp"
 #include "preferences.hpp"
 #include "replay.hpp"
+#include "statistics.hpp"
 #include "show_dialog.hpp"
 #include "wassert.hpp"
 #include "serialization/string_utils.hpp"
@@ -906,6 +907,7 @@
                }
 
                level_ = state_.snapshot;
+               level_.add_child("statistics") = statistics::write_stats();
 
                recorder = replay(state_.replay_data);
 
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.19 
wesnoth/src/multiplayer_wait.cpp:1.20
--- wesnoth/src/multiplayer_wait.cpp:1.19       Sat Mar 19 21:04:46 2005
+++ wesnoth/src/multiplayer_wait.cpp    Wed Mar 23 12:52:38 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.19 2005/03/19 21:04:46 gruikya Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.20 2005/03/23 12:52:38 j_daniel Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -19,6 +19,7 @@
 #include "multiplayer_wait.hpp"
 #include "preferences.hpp"
 #include "replay.hpp"
+#include "statistics.hpp"
 #include "util.hpp"
 #include "video.hpp"
 #include "wassert.hpp"
@@ -286,6 +287,12 @@
                level_.clear_children("replay");
        }
 
+       config const * const stats = level_.child("statistics");
+       if(stats != NULL) {
+               statistics::fresh_stats();
+               statistics::read_stats(*stats);
+       }
+
        LOG_NW << "starting game\n";
 
        state_.campaign_type = "multiplayer";