mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use min/max water height defines in mapgen

This commit is contained in:
Hielke Morsink 2021-05-19 11:30:41 +02:00
parent 18bb0a3c64
commit 6a64b5a63c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2-ui/windows/MapGen.cpp
View File

@ -45,7 +45,6 @@ enum {
WIDX_TAB_3, WIDX_TAB_3,
WIDX_TAB_4, WIDX_TAB_4,
TAB_BEGIN, TAB_BEGIN,
WIDX_MAP_GENERATE = TAB_BEGIN, WIDX_MAP_GENERATE = TAB_BEGIN,
@ -816,7 +815,7 @@ static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetI
mapgenSettings.mapSize = _mapSize; mapgenSettings.mapSize = _mapSize;
mapgenSettings.height = _baseHeight; mapgenSettings.height = _baseHeight;
mapgenSettings.water_level = _waterLevel + 2; mapgenSettings.water_level = _waterLevel + MINIMUM_WATER_HEIGHT;
mapgenSettings.floor = _randomTerrain ? -1 : _floorTexture; mapgenSettings.floor = _randomTerrain ? -1 : _floorTexture;
mapgenSettings.wall = _randomTerrain ? -1 : _wallTexture; mapgenSettings.wall = _randomTerrain ? -1 : _wallTexture;
mapgenSettings.trees = _placeTrees; mapgenSettings.trees = _placeTrees;
@ -877,11 +876,11 @@ static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widge
w->Invalidate(); w->Invalidate();
break; break;
case WIDX_SIMPLEX_WATER_LEVEL_UP: case WIDX_SIMPLEX_WATER_LEVEL_UP:
_waterLevel = std::min(_waterLevel + 2, 54); _waterLevel = std::min(_waterLevel + MINIMUM_WATER_HEIGHT, MINIMUM_WATER_HEIGHT + MAXIMUM_WATER_HEIGHT);
w->Invalidate(); w->Invalidate();
break; break;
case WIDX_SIMPLEX_WATER_LEVEL_DOWN: case WIDX_SIMPLEX_WATER_LEVEL_DOWN:
_waterLevel = std::max(_waterLevel - 2, 0); _waterLevel = std::max(_waterLevel - MINIMUM_WATER_HEIGHT, 0);
w->Invalidate(); w->Invalidate();
break; break;
case WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX: case WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX:
@ -1101,11 +1100,11 @@ static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex wid
widget_invalidate(w, WIDX_HEIGHTMAP_HIGH); widget_invalidate(w, WIDX_HEIGHTMAP_HIGH);
break; break;
case WIDX_HEIGHTMAP_WATER_LEVEL_UP: case WIDX_HEIGHTMAP_WATER_LEVEL_UP:
_waterLevel = std::min(_waterLevel + 2, 54); _waterLevel = std::min(_waterLevel + MINIMUM_WATER_HEIGHT, MINIMUM_WATER_HEIGHT + MAXIMUM_WATER_HEIGHT);
widget_invalidate(w, WIDX_HEIGHTMAP_WATER_LEVEL); widget_invalidate(w, WIDX_HEIGHTMAP_WATER_LEVEL);
break; break;
case WIDX_HEIGHTMAP_WATER_LEVEL_DOWN: case WIDX_HEIGHTMAP_WATER_LEVEL_DOWN:
_waterLevel = std::max(_waterLevel - 2, 0); _waterLevel = std::max(_waterLevel - MINIMUM_WATER_HEIGHT, 0);
widget_invalidate(w, WIDX_HEIGHTMAP_WATER_LEVEL); widget_invalidate(w, WIDX_HEIGHTMAP_WATER_LEVEL);
break; break;
} }