mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r20833) -Fix (r20832): Remove a warning.
This commit is contained in:
parent
e90930e572
commit
bce6328ed0
|
@ -33,9 +33,9 @@ enum GenWorldMode {
|
||||||
GWM_HEIGHTMAP = 3, ///< Generate a newgame from a heightmap
|
GWM_HEIGHTMAP = 3, ///< Generate a newgame from a heightmap
|
||||||
};
|
};
|
||||||
|
|
||||||
static const int CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY = 4; ///< Value for custom sea level in difficulty settings.
|
static const uint CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY = 4; ///< Value for custom sea level in difficulty settings.
|
||||||
static const int CUSTOM_SEA_LEVEL_MIN_PERCENTAGE = 1; ///< Minimum percentage a user can specify for custom sea level.
|
static const uint CUSTOM_SEA_LEVEL_MIN_PERCENTAGE = 1; ///< Minimum percentage a user can specify for custom sea level.
|
||||||
static const int CUSTOM_SEA_LEVEL_MAX_PERCENTAGE = 90; ///< Maximum percentage a user can specify for custom sea level.
|
static const uint CUSTOM_SEA_LEVEL_MAX_PERCENTAGE = 90; ///< Maximum percentage a user can specify for custom sea level.
|
||||||
|
|
||||||
typedef void GWDoneProc(); ///< Procedure called when the genworld process finishes
|
typedef void GWDoneProc(); ///< Procedure called when the genworld process finishes
|
||||||
typedef void GWAbortProc(); ///< Called when genworld is aborted
|
typedef void GWAbortProc(); ///< Called when genworld is aborted
|
||||||
|
|
|
@ -848,7 +848,7 @@ static void HeightMapSmoothSlopes(height_t dh_max)
|
||||||
static void HeightMapNormalize()
|
static void HeightMapNormalize()
|
||||||
{
|
{
|
||||||
int sea_level_setting = _settings_game.difficulty.quantity_sea_lakes;
|
int sea_level_setting = _settings_game.difficulty.quantity_sea_lakes;
|
||||||
const amplitude_t water_percent = sea_level_setting != CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY ? _water_percent[sea_level_setting] : _settings_game.game_creation.custom_sea_level * 1024 / 100;
|
const amplitude_t water_percent = sea_level_setting != (int)CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY ? _water_percent[sea_level_setting] : _settings_game.game_creation.custom_sea_level * 1024 / 100;
|
||||||
const height_t h_max_new = I2H(_max_height[_settings_game.difficulty.terrain_type]);
|
const height_t h_max_new = I2H(_max_height[_settings_game.difficulty.terrain_type]);
|
||||||
const height_t roughness = 7 + 3 * _settings_game.game_creation.tgen_smoothness;
|
const height_t roughness = 7 + 3 * _settings_game.game_creation.tgen_smoothness;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue