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

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/07/25 22:19:57

Modified files:
        src            : multiplayer_connect.cpp multiplayer_lobby.cpp 
        src/server     : server.cpp 

Log message:
        Added support to show game settings at the game list just some text no 
images or stuff like that.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/server.cpp.diff?tr1=1.85&tr2=1.86&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.152 
wesnoth/src/multiplayer_connect.cpp:1.153
--- wesnoth/src/multiplayer_connect.cpp:1.152   Mon Jul 25 09:56:25 2005
+++ wesnoth/src/multiplayer_connect.cpp Mon Jul 25 22:19:56 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.152 2005/07/25 09:56:25 j_daniel Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.153 2005/07/25 22:19:56 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -932,7 +932,11 @@
                level_.add_child("era", *era_cfg);
                level_["experience_modifier"] = 
lexical_cast<std::string>(params_.xp_modifier);
        }
-
+       level_["mp_village_gold"] = 
lexical_cast<std::string>(params_.village_gold);
+       level_["mp_use_map_settings"] = params_.use_map_settings ? "yes" : "no";
+       level_["mp_fog"] = params_.fog_game ? "yes" : "no";
+       level_["mp_shroud"] = params_.shroud_game ? "yes" : "no";
+       
        //this will force connecting clients to be using the same version 
number as us.
        level_["version"] = game_config::version;
 
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.76 
wesnoth/src/multiplayer_lobby.cpp:1.77
--- wesnoth/src/multiplayer_lobby.cpp:1.76      Sat Jul  2 21:37:19 2005
+++ wesnoth/src/multiplayer_lobby.cpp   Mon Jul 25 22:19:56 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.76 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.77 2005/07/25 22:19:56 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -27,7 +27,7 @@
 {
        std::ostringstream str;
        str << HEADING_PREFIX << _("Map") << COLUMN_SEPARATOR << _("Name")
-               << COLUMN_SEPARATOR << _("Status");
+               << COLUMN_SEPARATOR << _("Status") << COLUMN_SEPARATOR << 
_("Settings");
        return str.str();
 }
 
@@ -198,6 +198,12 @@
                        str << COLUMN_SEPARATOR << slots << " " <<
                                ngettext(_("Vacant Slot"), _("Vacant Slots"), 
nslots);
                }
+               str << COLUMN_SEPARATOR << "  " << (**game)["mp_village_gold"] 
<< " "
+                       << _("Gold") << "  " << (**game)["experience_modifier"] 
<< "% " << "XP";
+               if((**game)["mp_use_map_settings"] == "yes")
+                       str << "  " << _("Use map settings");
+               else if((**game)["mp_fog"] == "yes")
+                       str << "  " << _("Fog");
 
                game_strings.push_back(str.str());
 
Index: wesnoth/src/server/server.cpp
diff -u wesnoth/src/server/server.cpp:1.85 wesnoth/src/server/server.cpp:1.86
--- wesnoth/src/server/server.cpp:1.85  Thu Jul 21 20:19:15 2005
+++ wesnoth/src/server/server.cpp       Mon Jul 25 22:19:57 2005
@@ -1,4 +1,4 @@
-/* $Id: server.cpp,v 1.85 2005/07/21 20:19:15 isaaccp Exp $ */
+/* $Id: server.cpp,v 1.86 2005/07/25 22:19:57 j_daniel Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -760,7 +760,12 @@
                                g->level().values["map_data"] = 
data["map_data"];
                                g->level().values["map"] = data["map"];
                        }
-
+                       g->level().values["mp_use_map_settings"] = 
data["mp_use_map_settings"];
+                       g->level().values["mp_village_gold"] = 
data["mp_village_gold"];
+                       g->level().values["mp_fog"] = data["mp_fog"];
+                       g->level().values["mp_shroud"] = data["mp_shroud"];
+                       g->level().values["experience_modifier"] = 
data["experience_modifier"];
+                       
                        //update our config object which describes the
                        //open games, and notifies the game of where its 
description
                        //is located at