dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21080) -Fix: Do not allow to use a custom water level with the original map generator.

Browse Source
This commit is contained in:
terkhen
2010-11-04 18:34:37 +00:00
parent ab9279b5a0
commit 725cf7d8bb
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/settings.cpp
View File

@@ -902,6 +902,21 @@ static bool InvalidateIndustryViewWindow(int32 p1)
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.
@@ -941,17 +956,6 @@ void SetDifficultyLevel(int mode, DifficultySettings *gm_opt)
}
}
/**
* Checks the difficulty levels read from the configuration and
* forces them to be correct when invalid.
*/
static void CheckDifficultyLevels()
{
if (_settings_newgame.difficulty.diff_level != 3) {
SetDifficultyLevel(_settings_newgame.difficulty.diff_level, &_settings_newgame.difficulty);
}
}
static bool DifficultyReset(int32 level)
{
SetDifficultyLevel(level, (_game_mode == GM_MENU) ? &_settings_newgame.difficulty : &_settings_game.difficulty);
@@ -1477,7 +1481,7 @@ void LoadFromConfig()
IniLoadSettings(ini, _gameopt_settings, "gameopt", &_settings_newgame);
HandleOldDiffCustom(false);
CheckDifficultyLevels();
ValidateSettings();
delete ini;
}