[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src preferences.cpp unit.cpp preference...
From: |
David White |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src preferences.cpp unit.cpp preference... |
Date: |
Fri, 21 Jan 2005 18:34:49 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <address@hidden> 05/01/21 23:34:49
Modified files:
src : preferences.cpp unit.cpp preferences.hpp
Log message:
removed support for turning genders off
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.128&tr2=1.129&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.hpp.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
Patches:
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.128 wesnoth/src/preferences.cpp:1.129
--- wesnoth/src/preferences.cpp:1.128 Mon Dec 27 17:23:32 2004
+++ wesnoth/src/preferences.cpp Fri Jan 21 23:34:48 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.128 2004/12/27 17:23:32 silene Exp $ */
+/* $Id: preferences.cpp,v 1.129 2005/01/21 23:34:48 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -67,7 +67,6 @@
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"]);
@@ -705,17 +704,6 @@
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.44 wesnoth/src/preferences.hpp:1.45
--- wesnoth/src/preferences.hpp:1.44 Mon Dec 27 17:23:32 2004
+++ wesnoth/src/preferences.hpp Fri Jan 21 23:34:48 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.hpp,v 1.44 2004/12/27 17:23:32 silene Exp $ */
+/* $Id: preferences.hpp,v 1.45 2005/01/21 23:34:48 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -146,9 +146,6 @@
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.116 wesnoth/src/unit.cpp:1.117
--- wesnoth/src/unit.cpp:1.116 Fri Jan 21 22:21:54 2005
+++ wesnoth/src/unit.cpp Fri Jan 21 23:34:48 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.116 2005/01/21 22:21:54 Sirp Exp $ */
+/* $Id: unit.cpp,v 1.117 2005/01/21 23:34:48 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -65,10 +65,6 @@
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();
@@ -621,7 +617,7 @@
wassert(type_ != NULL);
- const std::string& gender = preferences::show_unit_genders() ?
cfg["gender"] : "";
+ const std::string& gender = cfg["gender"];
if(gender == "male") {
gender_ = unit_race::MALE;
} else if(gender == "female") {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src preferences.cpp unit.cpp preference...,
David White <=