[Wesnoth-cvs-commits] wesnoth/src playlevel.cpp multiplayer_wait.cpp ...

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/23 18:11:52

Modified files:
        src            : playlevel.cpp multiplayer_wait.cpp 
                         multiplayer_connect.cpp 

Log message:
        Fixed bug #12423 and a conflict between [side] side [side] and the 
multiplayer screen side

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.190&tr2=1.191&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.131&tr2=1.132&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.131 
wesnoth/src/multiplayer_connect.cpp:1.132
--- wesnoth/src/multiplayer_connect.cpp:1.131   Wed Mar 23 12:52:38 2005
+++ wesnoth/src/multiplayer_connect.cpp Wed Mar 23 18:11:52 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.131 2005/03/23 12:52:38 j_daniel Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.132 2005/03/23 18:11:52 j_daniel Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -655,7 +655,7 @@
        }
 
        if (!data["side"].empty()) {
-               int side_taken = lexical_cast_default<int>(data["side"], 0);
+               int side_taken = lexical_cast_default<int>(data["side"], 0) - 1;
 
                // Checks if the connecting user has a valid and unique name.
                const std::string name = data["name"];
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.20 
wesnoth/src/multiplayer_wait.cpp:1.21
--- wesnoth/src/multiplayer_wait.cpp:1.20       Wed Mar 23 12:52:38 2005
+++ wesnoth/src/multiplayer_wait.cpp    Wed Mar 23 18:11:52 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.20 2005/03/23 12:52:38 j_daniel Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.21 2005/03/23 18:11:52 j_daniel Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -237,7 +237,7 @@
                //team_ = faction_choice;
 
                config response;
-               response["side"] = lexical_cast<std::string>(side_choice);
+               response["side"] = lexical_cast<std::string>(side_choice + 1);
                response["name"] = preferences::login();
                response["faction"] = lexical_cast<std::string>(faction_choice);
                response["leader"] = leader_choice;
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.190 wesnoth/src/playlevel.cpp:1.191
--- wesnoth/src/playlevel.cpp:1.190     Tue Mar 22 23:42:36 2005
+++ wesnoth/src/playlevel.cpp   Wed Mar 23 18:11:52 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.190 2005/03/22 23:42:36 ydirson Exp $ */
+/* $Id: playlevel.cpp,v 1.191 2005/03/23 18:11:52 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -234,7 +234,9 @@
 
                LOG_NG << "initializing team...\n";
 
-               if (first_human_team == -1 && ((**ui)["controller"] == "human" 
|| (**ui)["persistent"] == "1")) {
+               if ((**ui)["controller"] == preferences::client_type() && 
(**ui)["description"] == preferences::login()) {
+                       first_human_team = ui - unit_cfg.begin();
+               } else if(first_human_team == -1 && ((**ui)["controller"] == 
"human" || (**ui)["persistent"] == "1")) {
                        first_human_team = ui - unit_cfg.begin();
                }