[Wesnoth-cvs-commits] wesnoth/src preferences.hpp preferences.cpp mul...

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/07/25 09:56:26

Modified files:
        src            : preferences.hpp preferences.cpp 
                         multiplayer_create.cpp multiplayer_create.hpp 
                         multiplayer_connect.cpp 

Log message:
        Added a Use map settings checkbox so sides can use different fog,
        shroud and village gold settings if it is defined in the scenario.
        If data for any of the sides is missing it'll be filled with the current
        settings selected in mp create.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.hpp.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.161&tr2=1.162&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.151&tr2=1.152&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.151 
wesnoth/src/multiplayer_connect.cpp:1.152
--- wesnoth/src/multiplayer_connect.cpp:1.151   Sun Jun 26 20:10:08 2005
+++ wesnoth/src/multiplayer_connect.cpp Mon Jul 25 09:56:25 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.151 2005/06/26 20:10:08 ott Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.152 2005/07/25 09:56:25 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -336,11 +336,18 @@
                res["colour"] = lexical_cast<std::string>(colour_ + 1);
                res["gold"] = lexical_cast<std::string>(gold_);
 
-               res["fog"] = parent_->params_.fog_game ? "yes" : "no";
-               res["shroud"] = parent_->params_.shroud_game ? "yes" : "no";
+               if(!parent_->params_.use_map_settings || res["fog"].empty() || 
(res["fog"] != "yes" && res["fog"] != "no")) {
+                       res["fog"] = parent_->params_.fog_game ? "yes" : "no";
+               }
+
+               if(!parent_->params_.use_map_settings || res["shroud"].empty() 
|| (res["shroud"] != "yes" && res["shroud"] != "no")) {
+                       res["shroud"] = parent_->params_.shroud_game ? "yes" : 
"no";
+               }
+
                res["share_maps"] = parent_->params_.share_maps ? "yes" : "no";
                res["share_view"] =  parent_->params_.share_view ? "yes" : "no";
-               res["village_gold"] = 
lexical_cast<std::string>(parent_->params_.village_gold);
+               if(!parent_->params_.use_map_settings || 
res["village_gold"].empty())
+                       res["village_gold"] = 
lexical_cast<std::string>(parent_->params_.village_gold);
 
                res["allow_changes"] = "yes";
        } else {
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.27 
wesnoth/src/multiplayer_create.cpp:1.28
--- wesnoth/src/multiplayer_create.cpp:1.27     Mon Jun  6 20:12:47 2005
+++ wesnoth/src/multiplayer_create.cpp  Mon Jul 25 09:56:25 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.27 2005/06/06 20:12:47 gruikya Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.28 2005/07/25 09:56:25 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -47,6 +47,7 @@
        num_players_label_(disp.video(), "", font::SIZE_SMALL, 
font::LOBBY_COLOUR),
        era_label_(disp.video(), _("Era:"), font::SIZE_SMALL, 
font::LOBBY_COLOUR),
        map_label_(disp.video(), _("Map to play:"), font::SIZE_SMALL, 
font::LOBBY_COLOUR),
+       use_map_settings_(disp.video(), _("Use map settings"), 
gui::button::TYPE_CHECK),
        fog_game_(disp.video(), _("Fog Of War"), gui::button::TYPE_CHECK),
        shroud_game_(disp.video(), _("Shroud"), gui::button::TYPE_CHECK),
        observers_game_(disp.video(), _("Observers"), gui::button::TYPE_CHECK),
@@ -93,7 +94,10 @@
        xp_modifier_slider_.set_value(preferences::xp_modifier());
        xp_modifier_slider_.set_increment(10);
        xp_modifier_slider_.set_help_string(_("The amount of experience a unit 
needs to advance"));
-
+       
+       use_map_settings_.set_check(preferences::use_map_settings());
+       use_map_settings_.set_help_string(_("Use scenario specific settings"));
+       
        fog_game_.set_check(preferences::fog());
        fog_game_.set_help_string(_("Enemy units cannot be seen unless they are 
in range of your units"));
 
@@ -144,6 +148,7 @@
 
        //Save values for next game
        preferences::set_allow_observers(parameters_.allow_observers);
+       preferences::set_use_map_settings(parameters_.use_map_settings);
        preferences::set_fog(parameters_.fog_game);
        preferences::set_shroud(parameters_.shroud_game);
        preferences::set_turns(parameters_.num_turns);
@@ -170,6 +175,7 @@
        parameters_.num_turns = turns;
        parameters_.village_gold = village_gold_slider_.value();
        parameters_.xp_modifier = xp_modifier_slider_.value();
+       parameters_.use_map_settings = use_map_settings_.checked();
        parameters_.fog_game = fog_game_.checked();
        parameters_.shroud_game = shroud_game_.checked();
        parameters_.allow_observers = observers_game_.checked();
@@ -344,6 +350,7 @@
        era_label_.hide(hide);
        map_label_.hide(hide);
 
+       use_map_settings_.hide(hide);
        fog_game_.hide(hide);
        shroud_game_.hide(hide);
        observers_game_.hide(hide);
@@ -446,6 +453,9 @@
        era_label_.set_location(xpos, ypos + (era_combo_.height() - 
era_label_.height()) / 2);
        era_combo_.set_location(xpos + era_label_.width() + border_size, ypos);
        ypos += era_combo_.height() + border_size;
+
+       use_map_settings_.set_location(xpos, ypos);
+       ypos += use_map_settings_.height() + border_size;
 
        fog_game_.set_location(xpos, ypos);
        ypos += fog_game_.height() + border_size;
Index: wesnoth/src/multiplayer_create.hpp
diff -u wesnoth/src/multiplayer_create.hpp:1.4 
wesnoth/src/multiplayer_create.hpp:1.5
--- wesnoth/src/multiplayer_create.hpp:1.4      Sat Jun  4 19:16:05 2005
+++ wesnoth/src/multiplayer_create.hpp  Mon Jul 25 09:56:25 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.hpp,v 1.4 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: multiplayer_create.hpp,v 1.5 2005/07/25 09:56:25 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -35,7 +35,7 @@
                        num_turns = 0;
                        village_gold = 0;
                        xp_modifier = 0;
-                       fog_game = shroud_game = allow_observers = share_view = 
share_maps = false;
+                       use_map_settings = fog_game = shroud_game = 
allow_observers = share_view = share_maps = false;
 
                        scenario_data.clear();
                }
@@ -48,6 +48,7 @@
                int num_turns;
                int village_gold;
                int xp_modifier;
+               bool use_map_settings;
                bool fog_game;
                bool shroud_game;
                bool allow_observers;
@@ -93,6 +94,7 @@
        gui::label era_label_;
        gui::label map_label_;
 
+       gui::button use_map_settings_;
        gui::button fog_game_;
        gui::button shroud_game_;
        gui::button observers_game_;
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.161 wesnoth/src/preferences.cpp:1.162
--- wesnoth/src/preferences.cpp:1.161   Sat Jul  2 21:37:19 2005
+++ wesnoth/src/preferences.cpp Mon Jul 25 09:56:25 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.161 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: preferences.cpp,v 1.162 2005/07/25 09:56:25 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -487,6 +487,16 @@
 void set_allow_observers(bool value)
 {
        prefs["allow_observers"] = value ? "yes" : "no";
+}
+
+bool use_map_settings()
+{
+       return prefs["mp_use_map_settings"] == "yes";
+}
+
+void set_use_map_settings(bool value)
+{
+       prefs["mp_use_map_settings"] = value ? "yes" : "no";
 }
 
 bool fog()
Index: wesnoth/src/preferences.hpp
diff -u wesnoth/src/preferences.hpp:1.57 wesnoth/src/preferences.hpp:1.58
--- wesnoth/src/preferences.hpp:1.57    Sat Jul  2 21:37:19 2005
+++ wesnoth/src/preferences.hpp Mon Jul 25 09:56:25 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.hpp,v 1.57 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: preferences.hpp,v 1.58 2005/07/25 09:56:25 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -103,6 +103,9 @@
 
        bool allow_observers();
        void set_allow_observers(bool value);
+
+       bool use_map_settings();
+       void set_use_map_settings(bool value);
 
        bool fog();
        void set_fog(bool value);