Author: shadowmaster
Date: Sun Oct 16 22:59:09 2011
New Revision: 51516
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51516&view=rev
Log:
Apply "Setting to ignore encountered_units" (patch #2940 by negusnyul)
The preferences entry name and tooltip are not the same as the patch in
the tracker, as we discussed on IRC that this doesn't exclusively affect
mainline units nor does it need to. I also changed the tooltip wording
to fit as much as possible in my 1280x800 screen without changing the
font size (works on 800x480 with a smaller font size).
Modified:
trunk/changelog
trunk/data/advanced_preferences.cfg
trunk/src/game_preferences.cpp
trunk/src/game_preferences.hpp
trunk/src/help.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=51516&r1=51515&r2=51516&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun Oct 16 22:59:09 2011
@@ -220,6 +220,8 @@
* Whiteboard planning system:
* Made the whiteboard respond better to :droid, :give_control, etc.
* Removed chat notification upon activating the whiteboard
+ * Added advanced preference to ignore the encountered units
+ list and show all unit types in the game Help
Version 1.9.8:
* Campaigns:
Modified: trunk/data/advanced_preferences.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/advanced_preferences.cfg?rev=51516&r1=51515&r2=51516&view=diff
==============================================================================
--- trunk/data/advanced_preferences.cfg (original)
+++ trunk/data/advanced_preferences.cfg Sun Oct 16 22:59:09 2011
@@ -153,6 +153,14 @@
[/advanced_preference]
[advanced_preference]
+ field=show_all_units_in_help
+ name= _ "Show All Unit Types in Help"
+ description= _ "Show all unit types in the help (requires restart). This
does not alter the list of encountered units."
+ type=boolean
+ default=no
+[/advanced_preference]
+
+[advanced_preference]
field=joystick_support_enabled
name=_"Joystick Support"
type=boolean
Modified: trunk/src/game_preferences.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_preferences.cpp?rev=51516&r1=51515&r2=51516&view=diff
==============================================================================
--- trunk/src/game_preferences.cpp (original)
+++ trunk/src/game_preferences.cpp Sun Oct 16 22:59:09 2011
@@ -811,6 +811,14 @@
return
lexical_cast_default<int>(preferences::get("chat_message_aging"), 20);
}
+bool show_all_units_in_help() {
+ return preferences::get("show_all_units_in_help", false);
+}
+
+void set_show_all_units_in_help(bool value) {
+ preferences::set("show_all_units_in_help", value);
+}
+
std::set<std::string> &encountered_units() {
return encountered_units_set;
}
Modified: trunk/src/game_preferences.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_preferences.hpp?rev=51516&r1=51515&r2=51516&view=diff
==============================================================================
--- trunk/src/game_preferences.hpp (original)
+++ trunk/src/game_preferences.hpp Sun Oct 16 22:59:09 2011
@@ -198,6 +198,9 @@
int chat_message_aging();
void set_chat_message_aging(const int aging);
+ bool show_all_units_in_help();
+ void set_show_all_units_in_help(bool value);
+
bool compress_saves();
bool startup_effect();
Modified: trunk/src/help.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/help.cpp?rev=51516&r1=51515&r2=51516&view=diff
==============================================================================
--- trunk/src/help.cpp (original)
+++ trunk/src/help.cpp Sun Oct 16 22:59:09 2011
@@ -1800,7 +1800,7 @@
UNIT_DESCRIPTION_TYPE description_type(const unit_type &type)
{
- if (game_config::debug) {
+ if (game_config::debug || preferences::show_all_units_in_help()) {
return FULL_DESCRIPTION;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
