cpp/openttd-patchpack/source Changeset - r17447:8677a76d35c0

Changeset - r17447:8677a76d35c0

Parent rev.

Child rev.

[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:

src/genworld_gui.cpp

src/lang/english.txt

src/table/settings.ini

0 comments (0 inline, 0 general)

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -378,22 +378,22 @@ struct GenerateLandscapeWindow : public @@
 			case GLAND_MAPSIZE_X_PULLDOWN:  SetDParam(0, 1 << _settings_newgame.game_creation.map_x); break;
 			case GLAND_MAPSIZE_Y_PULLDOWN:  SetDParam(0, 1 << _settings_newgame.game_creation.map_y); break;
 			case GLAND_SNOW_LEVEL_TEXT:     SetDParam(0, _settings_newgame.game_creation.snow_line_height); break;
 			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);
 				} else {
 					SetDParam(0, _num_towns[_settings_newgame.difficulty.number_towns]);
+				}
 				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;
 			case GLAND_WATER_PULLDOWN:
 				if (_settings_newgame.difficulty.quantity_sea_lakes == CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY) {

src/lang/english.txt

➞

Show inline comments

@@ @@ -1073,15 +1073,12 @@ STR_TERRAIN_TYPE_MOUNTAINOUS @@
 STR_ECONOMY_STEADY                                              :Steady
 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
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No suitable AIs available...{}You can download several AIs via the 'Online Content' system
 STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}This action changed the difficulty level to custom

src/table/settings.ini

➞

Show inline comments

@@ @@ -278,13 +278,13 @@ var = difficulty.disasters @@
 type     = SLE_UINT8
 from     = 97
 def      = 0
 min      = 0
 max      = 1
 interval = 1
-strval   = STR_DISASTERS_OFF
+strval   = STR_CONFIG_SETTING_OFF
 proc     = DifficultyChange
 [SDT_VAR]
 base     = GameSettings
 var      = difficulty.town_council_tolerance
 type     = SLE_UINT8

0 comments (0 inline, 0 general)