diff options
Diffstat (limited to 'src/landscape.cpp')
| -rw-r--r-- | src/landscape.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/landscape.cpp b/src/landscape.cpp index 7ed652885..2216a3831 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -526,7 +526,7 @@ void SetSnowLine(byte table[SNOW_LINE_MONTHS][SNOW_LINE_DAYS]) */ byte GetSnowLine(void) { - if (_snow_line == NULL) return _settings.game_creation.snow_line; + if (_snow_line == NULL) return _settings_game.game_creation.snow_line; YearMonthDay ymd; ConvertDateToYMD(_date, &ymd); @@ -539,7 +539,7 @@ byte GetSnowLine(void) */ byte HighestSnowLine(void) { - return _snow_line == NULL ? _settings.game_creation.snow_line : _snow_line->highest_value; + return _snow_line == NULL ? _settings_game.game_creation.snow_line : _snow_line->highest_value; } /** @@ -818,14 +818,14 @@ void GenerateLandscape(byte mode) static const int gwp_desert_amount = 4 + 8; if (mode == GW_HEIGHTMAP) { - SetGeneratingWorldProgress(GWP_LANDSCAPE, (_settings.game_creation.landscape == LT_TROPIC) ? 1 + gwp_desert_amount : 1); + SetGeneratingWorldProgress(GWP_LANDSCAPE, (_settings_game.game_creation.landscape == LT_TROPIC) ? 1 + gwp_desert_amount : 1); LoadHeightmap(_file_to_saveload.name); IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); - } else if (_settings.game_creation.land_generator == LG_TERRAGENESIS) { - SetGeneratingWorldProgress(GWP_LANDSCAPE, (_settings.game_creation.landscape == LT_TROPIC) ? 3 + gwp_desert_amount : 3); + } else if (_settings_game.game_creation.land_generator == LG_TERRAGENESIS) { + SetGeneratingWorldProgress(GWP_LANDSCAPE, (_settings_game.game_creation.landscape == LT_TROPIC) ? 3 + gwp_desert_amount : 3); GenerateTerrainPerlin(); } else { - switch (_settings.game_creation.landscape) { + switch (_settings_game.game_creation.landscape) { case LT_ARCTIC: { SetGeneratingWorldProgress(GWP_LANDSCAPE, 2); @@ -872,9 +872,9 @@ void GenerateLandscape(byte mode) uint32 r = Random(); - uint i = ScaleByMapSize(GB(r, 0, 7) + (3 - _settings.difficulty.quantity_sea_lakes) * 256 + 100); + uint i = ScaleByMapSize(GB(r, 0, 7) + (3 - _settings_game.difficulty.quantity_sea_lakes) * 256 + 100); for (; i != 0; --i) { - GenerateTerrain(_settings.difficulty.terrain_type, 0); + GenerateTerrain(_settings_game.difficulty.terrain_type, 0); } IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); } break; @@ -883,7 +883,7 @@ void GenerateLandscape(byte mode) ConvertGroundTilesIntoWaterTiles(); - if (_settings.game_creation.landscape == LT_TROPIC) CreateDesertOrRainForest(); + if (_settings_game.game_creation.landscape == LT_TROPIC) CreateDesertOrRainForest(); } void OnTick_Town(); |