miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch upstream/master while introducing compile errors and reverting parts of Android changes, video BPP options are gone

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-11-29 02:17:14 +02:00
parent 47b01a0528 39662aabef
commit 2f6b20cbfd
667 changed files with 66564 additions and 29169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/genworld_gui.cpp
View File

@@ -266,7 +266,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
static void StartGeneratingLandscape(GenerateLandscapeWindowMode mode)
{
DeleteAllNonVitalWindows();
CloseAllNonVitalWindows();
ClearErrorMessages();
/* Copy all XXX_newgame to XXX when coming from outside the editor */
@@ -958,7 +958,7 @@ static void _ShowGenerateLandscape(GenerateLandscapeWindowMode mode)
uint x = 0;
uint y = 0;
DeleteWindowByClass(WC_GENERATE_LANDSCAPE);
CloseWindowByClass(WC_GENERATE_LANDSCAPE);
/* Generate a new seed when opening the window */
_settings_newgame.game_creation.generation_seed = InteractiveRandom();
@@ -1258,7 +1258,7 @@ static WindowDesc _create_scenario_desc(
/** Show the window to create a scenario. */
void ShowCreateScenario()
{
DeleteWindowByClass(WC_GENERATE_LANDSCAPE);
CloseWindowByClass(WC_GENERATE_LANDSCAPE);
new CreateScenarioWindow(&_create_scenario_desc, GLWM_SCENARIO);
}
@@ -1449,7 +1449,7 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin
/* Never show steps smaller than 2%, even if it is a mod 5% */
if (_gws.percent <= last_percent + 2) return;
DEBUG(net, 1, "Map generation percentage complete: %d", _gws.percent);
Debug(net, 3, "Map generation percentage complete: {}", _gws.percent);
last_percent = _gws.percent;
return;