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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/10/02 15:53:59

Modified files:
        src            : preferences.cpp preferences.hpp unit.cpp 

Log message:
        added option to preferences file, 'unit_genders', which determines 
whether units with different genders should be used

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.hpp.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.98&tr2=1.99&r1=text&r2=text

Patches:
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.113 wesnoth/src/preferences.cpp:1.114
--- wesnoth/src/preferences.cpp:1.113   Mon Sep 27 00:24:41 2004
+++ wesnoth/src/preferences.cpp Sat Oct  2 15:53:58 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.113 2004/09/27 00:24:41 ydirson Exp $ */
+/* $Id: preferences.cpp,v 1.114 2004/10/02 15:53:58 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -47,6 +47,8 @@
 
 bool haloes = true;
 
+bool unit_genders = true;
+
 std::set<std::string> encountered_units_set;
 std::set<std::string> encountered_terrains_set;
 
@@ -62,6 +64,7 @@
 
        set_colour_cursors(prefs["colour_cursors"] == "yes");
        set_show_haloes(prefs["show_haloes"] != "no");
+       set_show_unit_genders(prefs["unit_genders"] != "no");
 
        std::vector<std::string> v;
        v = config::split(prefs["encountered_units"]);
@@ -560,6 +563,17 @@
        prefs["show_haloes"] = value ? "yes" : "no";
 }
 
+bool show_unit_genders()
+{
+       return unit_genders;
+}
+
+void set_show_unit_genders(bool value)
+{
+       prefs["unit_genders"] = value ? "yes" : "no";
+       unit_genders = value;
+}
+
 std::set<std::string> &encountered_units() {
        return encountered_units_set;
 }
Index: wesnoth/src/preferences.hpp
diff -u wesnoth/src/preferences.hpp:1.40 wesnoth/src/preferences.hpp:1.41
--- wesnoth/src/preferences.hpp:1.40    Thu Aug 26 02:50:15 2004
+++ wesnoth/src/preferences.hpp Sat Oct  2 15:53:58 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.hpp,v 1.40 2004/08/26 02:50:15 Sirp Exp $ */
+/* $Id: preferences.hpp,v 1.41 2004/10/02 15:53:58 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -113,6 +113,9 @@
        bool show_haloes();
        void set_show_haloes(bool value);
 
+       bool show_unit_genders();
+       void set_show_unit_genders(bool value);
+
        std::set<std::string> &encountered_units();
        std::set<std::string> &encountered_terrains();
 
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.98 wesnoth/src/unit.cpp:1.99
--- wesnoth/src/unit.cpp:1.98   Sun Sep 19 11:13:56 2004
+++ wesnoth/src/unit.cpp        Sat Oct  2 15:53:58 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.98 2004/09/19 11:13:56 silene Exp $ */
+/* $Id: unit.cpp,v 1.99 2004/10/02 15:53:58 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -17,6 +17,7 @@
 #include "language.hpp"
 #include "log.hpp"
 #include "pathfind.hpp"
+#include "preferences.hpp"
 #include "replay.hpp"
 #include "unit.hpp"
 #include "util.hpp"
@@ -60,6 +61,10 @@
 
 unit_race::GENDER unit::generate_gender(const unit_type& type, bool gen)
 {
+       if(preferences::show_unit_genders() == false) {
+               gen = false;
+       }
+
        const std::vector<unit_race::GENDER>& genders = type.genders();
        if(genders.empty() == false) {
                return gen ? genders[get_random()%genders.size()] : 
genders.front();
@@ -596,7 +601,7 @@
 
        assert(type_ != NULL);
 
-       const std::string& gender = cfg["gender"];
+       const std::string& gender = preferences::show_unit_genders() ? 
cfg["gender"] : "";
        if(gender == "male") {
                gender_ = unit_race::MALE;
        } else if(gender == "female") {