diff options
| author | alberth <alberth@openttd.org> | 2011-03-06 15:52:23 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2011-03-06 15:52:23 +0000 |
| commit | 5f505a69f3803172746df5f6ed29f5258b76db6c (patch) | |
| tree | 65c77c45a90b150fe131f47e6c532d78b07e6383 | |
| parent | 9fe65f93fea28f573160b85cbcf9505c0d9b2e3b (diff) | |
| download | openttd-5f505a69f3803172746df5f6ed29f5258b76db6c.tar.xz | |
(svn r22211) -Codechange: Unduplicate Off/On strings.
| -rw-r--r-- | src/genworld_gui.cpp | 4 | ||||
| -rw-r--r-- | src/lang/english.txt | 3 | ||||
| -rw-r--r-- | src/table/settings.ini | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index e8d983fd1..5104154d6 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -381,7 +381,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { 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 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { } 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; diff --git a/src/lang/english.txt b/src/lang/english.txt index 24297046c..d980f10d0 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1076,9 +1076,6 @@ STR_ECONOMY_FLUCTUATING :Fluctuating 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 diff --git a/src/table/settings.ini b/src/table/settings.ini index 057c53fac..e70eba3b2 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -281,7 +281,7 @@ def = 0 min = 0 max = 1 interval = 1 -strval = STR_DISASTERS_OFF +strval = STR_CONFIG_SETTING_OFF proc = DifficultyChange [SDT_VAR] |