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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/cheat_gui.cpp
#	src/genworld_gui.cpp
#	src/landscape.cpp
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/screenshot.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings.ini
#	src/tile_type.h
#	src/widgets/genworld_widget.h
This commit is contained in:
Jonathan G Rennison
2021-04-10 18:29:36 +01:00
parent fcded2aff7 76e92f6751
commit f39b6f4ba3
77 changed files with 587 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/genworld_widget.h
View File

@@ -26,14 +26,22 @@ enum GenerateLandscapeWidgets {
WID_GL_GENERATE_BUTTON, ///< 'Generate' button.
WID_GL_MAX_HEIGHTLEVEL_DOWN, ///< Decrease max. heightlevel
WID_GL_MAX_HEIGHTLEVEL_TEXT, ///< Max. heightlevel
WID_GL_MAX_HEIGHTLEVEL_UP, ///< Increase max. heightlevel
WID_GL_HEIGHTMAP_HEIGHT_DOWN, ///< Decrease heightmap highest mountain
WID_GL_HEIGHTMAP_HEIGHT_TEXT, ///< Max. heightmap highest mountain
WID_GL_HEIGHTMAP_HEIGHT_UP, ///< Increase max. heightmap highest mountain
WID_GL_START_DATE_DOWN, ///< Decrease start year.
WID_GL_START_DATE_TEXT, ///< Start year.
WID_GL_START_DATE_UP, ///< Increase start year.
WID_GL_SNOW_COVERAGE_DOWN, ///< Decrease snow coverage.
WID_GL_SNOW_COVERAGE_TEXT, ///< Snow coverage.
WID_GL_SNOW_COVERAGE_UP, ///< Increase snow coverage.
WID_GL_DESERT_COVERAGE_DOWN, ///< Decrease desert coverage.
WID_GL_DESERT_COVERAGE_TEXT, ///< Desert coverage.
WID_GL_DESERT_COVERAGE_UP, ///< Increase desert coverage.
WID_GL_SNOW_LEVEL_DOWN, ///< Decrease snow level.
WID_GL_SNOW_LEVEL_TEXT, ///< Snow level.
WID_GL_SNOW_LEVEL_UP, ///< Increase snow level.
@@ -60,8 +68,8 @@ enum GenerateLandscapeWidgets {
WID_GL_WATER_SE, ///< SE 'Water'/'Freeform'.
WID_GL_WATER_SW, ///< SW 'Water'/'Freeform'.
WID_GL_LEVEL_SEL_1, ///< NWID_SELECTION for snow or rainforest level label
WID_GL_LEVEL_SEL_2, ///< NWID_SELECTION for snow or rainforest level selector
WID_GL_CLIMATE_SEL_LABEL, ///< NWID_SELECTION for snow or desert coverage label
WID_GL_CLIMATE_SEL_SELECTOR, ///< NWID_SELECTION for snow or desert coverage selector
};
/** Widgets of the #CreateScenarioWindow class. */