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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/04/17 13:49:00

Modified files:
        src            : game.cpp replay.cpp statistics.cpp 
                         statistics.hpp 

Log message:
        Removed the remains of the "replay verification" code which was broken 
and
        partially commented out.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.229&tr2=1.230&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.cpp.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/statistics.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/statistics.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.229 wesnoth/src/game.cpp:1.230
--- wesnoth/src/game.cpp:1.229  Mon Apr 11 21:21:02 2005
+++ wesnoth/src/game.cpp        Sun Apr 17 13:49:00 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.229 2005/04/11 21:21:02 gruikya Exp $ */
+/* $Id: game.cpp,v 1.230 2005/04/17 13:49:00 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -807,9 +807,6 @@
        } else {
                // We have a snapshot. But does the user want to see a replay?
                if(show_replay) {
-                       // clear the stats for the current level
-                       // they will be regenerated during the replay
-                       statistics::replay_verify_stats = 
statistics::write_stats();
                        statistics::clear_current_scenario();
                        std::cerr << "replaying (snapshot)\n";
                } else {
Index: wesnoth/src/replay.cpp
diff -u wesnoth/src/replay.cpp:1.105 wesnoth/src/replay.cpp:1.106
--- wesnoth/src/replay.cpp:1.105        Sun Apr 17 13:18:34 2005
+++ wesnoth/src/replay.cpp      Sun Apr 17 13:49:00 2005
@@ -1,4 +1,4 @@
-/* $Id: replay.cpp,v 1.105 2005/04/17 13:18:34 gruikya Exp $ */
+/* $Id: replay.cpp,v 1.106 2005/04/17 13:49:00 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -608,22 +608,6 @@
                //if there is nothing more in the records
                if(cfg == NULL) {
                        replayer.set_skip(0);
-                       const config current_stats = statistics::write_stats();
-                       if(current_stats != statistics::replay_verify_stats) {
-                               ERR_NW << "replay statistics verification 
failed\n";
-                               //Disabling because it breaks multiplayer.
-                               //Apparently, statistics::replay_verify_stats
-                               //is only written to in game::load_game() (!)
-                               //Re-enable when fixed / if I am wrong.
-                               //
-                               //By the way, making a "config" object global
-                               //is highly objectable IMO.
-                               //
-                               // --Ayin 30 mar. 2005
-                               //
-                               //if (!game_config::ignore_replay_errors) 
-                               //      throw replay::error();
-                       }
                        return false;
                }
 
Index: wesnoth/src/statistics.cpp
diff -u wesnoth/src/statistics.cpp:1.16 wesnoth/src/statistics.cpp:1.17
--- wesnoth/src/statistics.cpp:1.16     Sat Apr  9 22:27:31 2005
+++ wesnoth/src/statistics.cpp  Sun Apr 17 13:49:00 2005
@@ -444,5 +444,4 @@
        return res;
 }
 
-config replay_verify_stats;
 }
Index: wesnoth/src/statistics.hpp
diff -u wesnoth/src/statistics.hpp:1.10 wesnoth/src/statistics.hpp:1.11
--- wesnoth/src/statistics.hpp:1.10     Thu Mar 24 21:56:44 2005
+++ wesnoth/src/statistics.hpp  Sun Apr 17 13:49:00 2005
@@ -82,8 +82,6 @@
 
        std::vector<std::string> get_categories();
        stats calculate_stats(int category, int side);
-       
-       extern config replay_verify_stats;
 }
 
 #endif