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/saveload/cargopacket_sl.cpp
#	src/saveload/saveload.h
#	src/strings.cpp
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2023-04-12 20:02:57 +01:00
parent 6e091c78b8 97cfd40649
commit c89079a210
26 changed files with 659 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/genworld_gui.cpp
View File

@@ -658,32 +658,33 @@ struct GenerateLandscapeWindow : public Window {
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{
Dimension d{0, (uint)FONT_HEIGHT_NORMAL};
const StringID *strs = nullptr;
switch (widget) {
case WID_GL_HEIGHTMAP_HEIGHT_TEXT:
SetDParam(0, MAX_TILE_HEIGHT);
*size = GetStringBoundingBox(STR_JUST_INT);
d = GetStringBoundingBox(STR_JUST_INT);
break;
case WID_GL_START_DATE_TEXT:
SetDParam(0, ConvertYMDToDate(MAX_YEAR, 0, 1));
*size = maxdim(*size, GetStringBoundingBox(STR_BLACK_DATE_LONG));
d = GetStringBoundingBox(STR_BLACK_DATE_LONG);
break;
case WID_GL_MAPSIZE_X_PULLDOWN:
case WID_GL_MAPSIZE_Y_PULLDOWN:
SetDParamMaxValue(0, MAX_MAP_SIZE);
*size = maxdim(*size, GetStringBoundingBox(STR_JUST_INT));
d = GetStringBoundingBox(STR_JUST_INT);
break;
case WID_GL_SNOW_COVERAGE_TEXT:
SetDParamMaxValue(0, MAX_TILE_HEIGHT);
*size = maxdim(*size, GetStringBoundingBox(STR_MAPGEN_SNOW_COVERAGE_TEXT));
d = GetStringBoundingBox(STR_MAPGEN_SNOW_COVERAGE_TEXT);
break;
case WID_GL_DESERT_COVERAGE_TEXT:
SetDParamMaxValue(0, MAX_TILE_HEIGHT);
*size = maxdim(*size, GetStringBoundingBox(STR_MAPGEN_DESERT_COVERAGE_TEXT));
d = GetStringBoundingBox(STR_MAPGEN_DESERT_COVERAGE_TEXT);
break;
case WID_GL_SNOW_LEVEL_TEXT:
@@ -699,31 +700,31 @@ struct GenerateLandscapeWindow : public Window {
case WID_GL_HEIGHTMAP_SIZE_TEXT:
SetDParam(0, this->x);
SetDParam(1, this->y);
*size = maxdim(*size, GetStringBoundingBox(STR_MAPGEN_HEIGHTMAP_SIZE));
d = GetStringBoundingBox(STR_MAPGEN_HEIGHTMAP_SIZE);
break;
case WID_GL_TOWN_PULLDOWN:
strs = _num_towns;
SetDParamMaxValue(0, CUSTOM_TOWN_MAX_NUMBER);
*size = maxdim(*size, GetStringBoundingBox(STR_NUM_CUSTOM_NUMBER));
d = GetStringBoundingBox(STR_NUM_CUSTOM_NUMBER);
break;
case WID_GL_INDUSTRY_PULLDOWN:
strs = _num_inds;
SetDParamMaxValue(0, IndustryPool::MAX_SIZE);
*size = maxdim(*size, GetStringBoundingBox(STR_NUM_CUSTOM_NUMBER));
d = GetStringBoundingBox(STR_NUM_CUSTOM_NUMBER);
break;
case WID_GL_TERRAIN_PULLDOWN:
strs = _elevations;
SetDParamMaxValue(0, MAX_MAP_HEIGHT_LIMIT);
*size = maxdim(*size, GetStringBoundingBox(STR_TERRAIN_TYPE_CUSTOM_VALUE));
d = GetStringBoundingBox(STR_TERRAIN_TYPE_CUSTOM_VALUE);
break;
case WID_GL_WATER_PULLDOWN:
strs = _sea_lakes;
SetDParamMaxValue(0, CUSTOM_SEA_LEVEL_MAX_PERCENTAGE);
*size = maxdim(*size, GetStringBoundingBox(STR_SEA_LEVEL_CUSTOM_PERCENTAGE));
d = GetStringBoundingBox(STR_SEA_LEVEL_CUSTOM_PERCENTAGE);
break;
case WID_GL_RIVER_PULLDOWN: strs = _rivers; break;
@@ -731,14 +732,14 @@ struct GenerateLandscapeWindow : public Window {
case WID_GL_VARIETY_PULLDOWN: strs = _variety; break;
case WID_GL_HEIGHTMAP_ROTATION_PULLDOWN: strs = _rotation; break;
case WID_GL_BORDERS_RANDOM:
*size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOMIZE), GetStringBoundingBox(STR_MAPGEN_BORDER_MANUAL));
d = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOMIZE), GetStringBoundingBox(STR_MAPGEN_BORDER_MANUAL));
break;
case WID_GL_WATER_NE:
case WID_GL_WATER_NW:
case WID_GL_WATER_SE:
case WID_GL_WATER_SW:
*size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOM), maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_WATER), GetStringBoundingBox(STR_MAPGEN_BORDER_FREEFORM)));
d = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOM), maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_WATER), GetStringBoundingBox(STR_MAPGEN_BORDER_FREEFORM)));
break;
case WID_GL_HEIGHTMAP_NAME_TEXT:
@@ -750,11 +751,12 @@ struct GenerateLandscapeWindow : public Window {
}
if (strs != nullptr) {
while (*strs != INVALID_STRING_ID) {
*size = maxdim(*size, GetStringBoundingBox(*strs++));
d = maxdim(d, GetStringBoundingBox(*strs++));
}
}
size->width += padding.width;
size->height = std::max(size->height, (uint)(FONT_HEIGHT_NORMAL + padding.height));
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
}
void OnClick(Point pt, int widget, int click_count) override
@@ -1299,9 +1301,10 @@ struct CreateScenarioWindow : public Window
default:
return;
}
*size = maxdim(*size, GetStringBoundingBox(str));
size->width += padding.width;
size->height += padding.height;
Dimension d = GetStringBoundingBox(str);
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
}
void OnClick(Point pt, int widget, int click_count) override