mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22211) -Codechange: Unduplicate Off/On strings.

This commit is contained in:
alberth 2011-03-06 15:52:23 +00:00
parent 9fe65f93fe
commit 5f505a69f3
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/genworld_gui.cpp
View File

@ -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;

3
src/lang/english.txt
View File

@ -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

2
src/table/settings.ini
View File

@ -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]