Mercurial > hg > openttd

changeset 17457:1a8bb6dc6dc6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22211) -Codechange: Unduplicate Off/On strings.
author alberth <alberth@openttd.org>
date Sun, 06 Mar 2011 15:52:23 +0000
parents 6dce16791f02
children 32d0cbf4c9ff
files src/genworld_gui.cpp src/lang/english.txt src/table/settings.ini
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -381,7 +381,7 @@
 
 			case GLAND_TOWN_PULLDOWN:
 				if (_game_mode == GM_EDITOR) {
-					SetDParam(0, STR_DISASTERS_OFF);
+					SetDParam(0, STR_CONFIG_SETTING_OFF);
 				} else if (_settings_newgame.difficulty.number_towns == CUSTOM_TOWN_NUMBER_DIFFICULTY) {
 					SetDParam(0, STR_NUM_CUSTOM_NUMBER);
 					SetDParam(1, _settings_newgame.game_creation.custom_town_number);
@@ -390,7 +390,7 @@
 				}
 				break;
 
-			case GLAND_INDUSTRY_PULLDOWN:   SetDParam(0, _game_mode == GM_EDITOR ? STR_DISASTERS_OFF : _num_inds[_settings_newgame.difficulty.industry_density]); break;
+			case GLAND_INDUSTRY_PULLDOWN:   SetDParam(0, _game_mode == GM_EDITOR ? STR_CONFIG_SETTING_OFF : _num_inds[_settings_newgame.difficulty.industry_density]); break;
 			case GLAND_LANDSCAPE_PULLDOWN:  SetDParam(0, _landscape[_settings_newgame.game_creation.land_generator]); break;
 			case GLAND_TREE_PULLDOWN:       SetDParam(0, _tree_placer[_settings_newgame.game_creation.tree_placer]); break;
 			case GLAND_TERRAIN_PULLDOWN:    SetDParam(0, _elevations[_settings_newgame.difficulty.terrain_type]); break;
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1076,9 +1076,6 @@
 STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS                      :At end of line, and at stations
 STR_REVERSE_AT_END_OF_LINE_ONLY                                 :At end of line only
 
-STR_DISASTERS_OFF                                               :Off
-STR_DISASTERS_ON                                                :On
-
 STR_CITY_APPROVAL_PERMISSIVE                                    :Permissive
 STR_CITY_APPROVAL_TOLERANT                                      :Tolerant
 STR_CITY_APPROVAL_HOSTILE                                       :Hostile
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -281,7 +281,7 @@
 min      = 0
 max      = 1
 interval = 1
-strval   = STR_DISASTERS_OFF
+strval   = STR_CONFIG_SETTING_OFF
 proc     = DifficultyChange
 
 [SDT_VAR]