Merge branch 'master' into jgrpp

# 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
77 changed files with 587 additions and 448 deletions

View File

@@ -61,6 +61,7 @@ static bool ViewportMapShowTunnelModeChanged(int32 p1);
static bool ViewportMapLandscapeModeChanged(int32 p1);
static bool UpdateLinkgraphColours(int32 p1);
static bool InvalidateAllVehicleImageCaches(int32 p1);
static bool ClimateThresholdModeChanged(int32 p1);
static bool UpdateClientName(int32 p1);
static bool UpdateServerPassword(int32 p1);
@@ -350,7 +351,7 @@ from = SLV_97
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 1
min = 0
max = 4
max = 5
interval = 1
str = STR_CONFIG_SETTING_TERRAIN_TYPE
strhelp = STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT
@@ -537,19 +538,19 @@ cat = SC_BASIC
[SDT_VAR]
base = GameSettings
var = construction.max_heightlevel
var = construction.map_height_limit
type = SLE_UINT8
from = SLV_194
guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
def = DEF_MAX_HEIGHTLEVEL
min = MIN_MAX_HEIGHTLEVEL
max = MAX_MAX_HEIGHTLEVEL
guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_0ISDISABLED
def = 0
min = MIN_MAP_HEIGHT_LIMIT
max = MAX_MAP_HEIGHT_LIMIT
interval = 1
str = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL
strhelp = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT
strval = STR_JUST_INT
str = STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT
strhelp = STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT
strval = STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_VALUE
proc = ChangeMaxHeightLevel
cat = SC_BASIC
cat = SC_ADVANCED
extver = SlXvFeatureTest(XSLFTO_OR, XSLFI_HEIGHT_8_BIT, 1, 1)
;; construction.allow_more_heightlevels
@@ -557,6 +558,17 @@ extver = SlXvFeatureTest(XSLFTO_OR, XSLFI_HEIGHT_8_BIT, 1, 1)
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_CHILLPP)
[SDT_VAR]
base = GameSettings
var = game_creation.heightmap_height
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
min = MIN_HEIGHTMAP_HEIGHT
max = MAX_MAP_HEIGHT_LIMIT
interval = 1
[SDT_BOOL]
base = GameSettings
var = construction.build_on_slopes
@@ -2235,6 +2247,20 @@ strval = STR_JUST_COMMA
cat = SC_BASIC
patxname = ""rainforest_line_height.game_creation.rainforest_line_height""
[SDT_VAR]
base = GameSettings
var = game_creation.climate_threshold_mode
type = SLE_UINT8
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 0
min = 0
max = 1
str = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_MODE
strhelp = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_MODE_HELPTEXT
strval = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_COVERAGE
proc = ClimateThresholdModeChanged
patxname = ""climate.game_creation.climate_threshold_mode""
;;game_creation.desert_amount
[SDT_NULL]
length = 1
@@ -2250,6 +2276,36 @@ extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_CHILLPP)
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_VAR]
base = GameSettings
var = game_creation.snow_coverage
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = DEF_SNOW_COVERAGE
min = 0
max = 100
interval = 10
str = STR_CONFIG_SETTING_SNOW_COVERAGE
strhelp = STR_CONFIG_SETTING_SNOW_COVERAGE_HELPTEXT
strval = STR_CONFIG_SETTING_SNOW_COVERAGE_VALUE
cat = SC_BASIC
[SDT_VAR]
base = GameSettings
var = game_creation.desert_coverage
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = DEF_DESERT_COVERAGE
min = 0
max = 100
interval = 10
str = STR_CONFIG_SETTING_DESERT_COVERAGE
strhelp = STR_CONFIG_SETTING_DESERT_COVERAGE_HELPTEXT
strval = STR_CONFIG_SETTING_DESERT_COVERAGE_VALUE
cat = SC_BASIC
[SDT_NULL]
length = 4
to = SLV_144
@@ -3790,6 +3846,17 @@ extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
xref = ""construction.trees_around_snow_line_range""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_VAR]
base = GameSettings
var = game_creation.custom_terrain_type
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
min = MIN_CUSTOM_TERRAIN_TYPE
max = MAX_MAP_HEIGHT_LIMIT
interval = 1
[SDT_VAR]
base = GameSettings
var = game_creation.custom_sea_level