[Wesnoth-commits] r26123 - /branches/1.4/src/server/game.cpp

[soliton . de]

Author: soliton
Date: Sat Apr 26 14:42:09 2008
New Revision: 26123

URL: http://svn.gna.org/viewcvs/wesnoth?rev=26123&view=rev
Log:
* only notify an observer of his status if he wanted a slot

Modified:
    branches/1.4/src/server/game.cpp

Modified: branches/1.4/src/server/game.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/server/game.cpp?rev=26123&r1=26122&r2=26123&view=diff
==============================================================================
--- branches/1.4/src/server/game.cpp (original)
+++ branches/1.4/src/server/game.cpp Sat Apr 26 14:42:09 2008
@@ -877,6 +877,7 @@
        }
        user->second.mark_available(id_, name_);
        DBG_GAME << debug_player_info();
+       bool became_observer = false;
        if (!started_ && !observer && take_side(user)) {
                DBG_GAME << "adding player...\n";
                players_.push_back(player);
@@ -885,7 +886,7 @@
        } else if (!allow_observers()) {
                return; //false;
        } else {
-               observer = true;
+               if (!observer) became_observer = true;
                DBG_GAME << "adding observer...\n";
                observers_.push_back(player);
 
@@ -915,7 +916,7 @@
                send_user_list();
        }
 
-       if (observer && end_turn_ == 0) {
+       if (became_observer) {
                // in case someone took the last slot right before this player
                send_server_message("You are an observer.", player);
        }


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits