Author: soliton
Date: Wed Apr  1 12:53:14 2009
New Revision: 34374

URL: http://svn.gna.org/viewcvs/wesnoth?rev=34374&view=rev
Log:
don't save replays when the game didn't start + eliminate some now redundant 
logging

Modified:
    trunk/src/server/game.cpp
    trunk/src/server/server.cpp

Modified: trunk/src/server/game.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/game.cpp?rev=34374&r1=34373&r2=34374&view=diff
==============================================================================
--- trunk/src/server/game.cpp (original)
+++ trunk/src/server/game.cpp Wed Apr  1 12:53:14 2009
@@ -984,7 +984,7 @@
                << ". (socket: " << user->first << ")\n";
        // No need to do anything more when the game gets destructed.
        if (destruct) return true;
-       if (game_ended) {
+       if (game_ended && started_) {
                send_server_message_to_all((user->second.name() + " ended the 
game.").c_str(), player);
                return true;
        }
@@ -1209,7 +1209,7 @@
 }
 
 void game::save_replay() {
-       if (!save_replays_) return;
+       if (!save_replays_ || !started_) return;
 
        std::string replay_commands;
        for(std::vector<simple_wml::document*>::iterator i = history_.begin();

Modified: trunk/src/server/server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/server.cpp?rev=34374&r1=34373&r2=34374&view=diff
==============================================================================
--- trunk/src/server/server.cpp (original)
+++ trunk/src/server/server.cpp Wed Apr  1 12:53:14 2009
@@ -2146,14 +2146,6 @@
        } else if (data.child("leave_game")) {
                if ((g->is_player(sock) && g->nplayers() == 1)
                        || (g->is_owner(sock) && !g->started())) {
-                       LOG_SERVER << network::ip_address(sock) << "\t" << 
pl->second.name()
-                               << (g->started() ? "\tended game:\t\"" : 
"\taborted game:\t\"")
-                               << g->name() << "\" (" << g->id() << ")"
-                               << (g->started() ? " at turn: "
-                                       + 
lexical_cast_default<std::string,size_t>(g->current_turn())
-                                       + " with reason: '" + 
g->termination_reason() + "'" : "")
-                               << ".\n";
-                       g->send_server_message_to_all((pl->second.name() + " 
ended the game.").c_str(), pl->first);
                        // Remove the player in delete_game() with all other 
remaining
                        // ones so he gets the updated gamelist.
                        delete_game(itor);


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to