Changeset - r17447:8677a76d35c0
[Not reviewed]
master
0 3 0
alberth - 13 years ago 2011-03-06 15:52:23
alberth@openttd.org
(svn r22211) -Codechange: Unduplicate Off/On strings.
3 files changed with 3 insertions and 6 deletions:
0 comments (0 inline, 0 general)
src/genworld_gui.cpp
Show inline comments
 
@@ -381,7 +381,7 @@ struct GenerateLandscapeWindow : public 
 

	
 
			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 
 
				}
 
				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;
src/lang/english.txt
Show inline comments
 
@@ -1076,9 +1076,6 @@ STR_ECONOMY_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
src/table/settings.ini
Show inline comments
 
@@ -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]
0 comments (0 inline, 0 general)