Author: soliton
Date: Wed Apr 15 18:05:26 2009
New Revision: 34939
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34939&view=rev
Log:
send the game ended server message at the same times we log it
Modified:
branches/1.6/src/server/game.cpp
Modified: branches/1.6/src/server/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/server/game.cpp?rev=34939&r1=34938&r2=34939&view=diff
==============================================================================
--- branches/1.6/src/server/game.cpp (original)
+++ branches/1.6/src/server/game.cpp Wed Apr 15 18:05:26 2009
@@ -983,12 +983,11 @@
<< (observer ? " as an observer" : "")
<< (disconnect ? " and disconnected" : "")
<< ". (socket: " << user->first << ")\n";
- // No need to do anything more when the game gets destructed.
- if (destruct) return true;
- if (game_ended) {
- if (started_) send_server_message_to_all((user->second.name() +
" ended the game.").c_str(), player);
- return true;
- }
+ if (game_ended && started_ && !(observer && destruct)) {
+ send_server_message_to_all((user->second.name() + " ended the
game.").c_str(), player);
+ }
+ if (game_ended || destruct) return game_ended;
+
// Don't mark_available() since the player got already removed from the
// games_and_users_list_.
if (!disconnect) user->second.mark_available();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
