cpp/openttd-patchpack/source Changeset - r16356:e0f15c91bb7d

Changeset - r16356:e0f15c91bb7d

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

terkhen - 14 years ago 2010-11-04 19:34:40
terkhen@openttd.org

(svn r21082) -Fix (r21080): Compilation error.

1 file changed with 15 insertions and 15 deletions:

src/settings.cpp

0 comments (0 inline, 0 general)

src/settings.cpp

➞

Show inline comments

@@ @@ -902,21 +902,6 @@ static bool InvalidateIndustryViewWindow @@
 	return true;
+}
 /** Checks if any settings are set to incorrect values, and sets them to correct values in that case. */
 static void ValidateSettings()
+{
 	/* Force the difficulty levels to correct values if they are invalid. */
 	if (_settings_newgame.difficulty.diff_level != 3) {
 		SetDifficultyLevel(_settings_newgame.difficulty.diff_level, &_settings_newgame.difficulty);
+	}
 	/* Do not allow a custom sea level with the original land generator. */
 	if (_settings_newgame.game_creation.land_generator == 0 &&
 			_settings_newgame.difficulty.quantity_sea_lakes == CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY) {
 		_settings_newgame.difficulty.quantity_sea_lakes = CUSTOM_SEA_LEVEL_MIN_PERCENTAGE;
+	}
+}
 /*
  * A: competitors
  * B: competitor start time. Deprecated since savegame version 110.
@@ @@ -956,6 +941,21 @@ void SetDifficultyLevel(int mode, Diffic @@
+	}
+}
 /** Checks if any settings are set to incorrect values, and sets them to correct values in that case. */
 static void ValidateSettings()
+{
 	/* Force the difficulty levels to correct values if they are invalid. */
 	if (_settings_newgame.difficulty.diff_level != 3) {
 		SetDifficultyLevel(_settings_newgame.difficulty.diff_level, &_settings_newgame.difficulty);
+	}
 	/* Do not allow a custom sea level with the original land generator. */
 	if (_settings_newgame.game_creation.land_generator == 0 &&
 			_settings_newgame.difficulty.quantity_sea_lakes == CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY) {
 		_settings_newgame.difficulty.quantity_sea_lakes = CUSTOM_SEA_LEVEL_MIN_PERCENTAGE;
+	}
+}
 static bool DifficultyReset(int32 level)
+{
 	SetDifficultyLevel(level, (_game_mode == GM_MENU) ? &_settings_newgame.difficulty : &_settings_game.difficulty);

0 comments (0 inline, 0 general)