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

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/06/26 20:10:08

Modified files:
        .              : changelog 
        src            : multiplayer_connect.cpp 

Log message:
        obey "Observers" setting for MP games (#13374)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.752&tr2=1.753&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.150&tr2=1.151&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.752 wesnoth/changelog:1.753
--- wesnoth/changelog:1.752     Sun Jun 26 13:45:30 2005
+++ wesnoth/changelog   Sun Jun 26 20:10:07 2005
@@ -8,6 +8,7 @@
    * multiplayer replays no longer show 'The End' and game credits (#13375)
    * fixed off-by-one error in Unit List (#13323)
    * fixed multiple Returns registered by some dialogs (part of #13332)
+   * "Observers" setting for multiplayer games is now obeyed again (#13374)
  * language and i18n:
    * fixed 'make dist' not removing stamp-po files, causing broken translations
    * updated translations:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.150 
wesnoth/src/multiplayer_connect.cpp:1.151
--- wesnoth/src/multiplayer_connect.cpp:1.150   Mon Jun  6 20:12:47 2005
+++ wesnoth/src/multiplayer_connect.cpp Sun Jun 26 20:10:08 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.150 2005/06/06 20:12:47 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.151 2005/06/26 20:10:08 ott Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -929,7 +929,7 @@
        //this will force connecting clients to be using the same version 
number as us.
        level_["version"] = game_config::version;
 
-       level_["observers"] = params_.allow_observers ? "yes" : "no";
+       level_["observer"] = params_.allow_observers ? "yes" : "no";
 
        if(level_["objectives"].empty()) {
                level_["objectives"] = t_string(N_("Victory\n\