mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 18:25:16 +01:00
Code Issues Releases Wiki Activity

Fix mapgen clang-formatting

Browse Source
This commit is contained in:
Hielke Morsink
2021-10-19 22:27:41 +02:00
parent 7e2e6e2b2f
commit 64d8b1bd69
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2/world/MapGen.cpp
View File

@@ -209,12 +209,12 @@ void mapgen_generate(mapgen_settings* settings)
{
switch (util_rand() % 4)
{
case 0:
beachTexture = "rct2.terrain_surface.sand";
break;
case 1:
beachTexture = "rct2.terrain_surface.sand_brown";
break;
case 0:
beachTexture = "rct2.terrain_surface.sand";
break;
case 1:
beachTexture = "rct2.terrain_surface.sand_brown";
break;
}
}
auto beachTextureId = object_manager_get_loaded_object_entry_index(ObjectEntryDescriptor(beachTexture));
@@ -713,15 +713,15 @@ bool mapgen_load_heightmap(const utf8* path)
{
switch (format)
{
case IMAGE_FORMAT::BITMAP:
context_show_error(STR_HEIGHT_MAP_ERROR, STR_ERROR_READING_BITMAP, {});
break;
case IMAGE_FORMAT::PNG_32:
context_show_error(STR_HEIGHT_MAP_ERROR, STR_ERROR_READING_PNG, {});
break;
default:
log_error("Unable to load height map image: %s", e.what());
break;
case IMAGE_FORMAT::BITMAP:
context_show_error(STR_HEIGHT_MAP_ERROR, STR_ERROR_READING_BITMAP, {});
break;
case IMAGE_FORMAT::PNG_32:
context_show_error(STR_HEIGHT_MAP_ERROR, STR_ERROR_READING_PNG, {});
break;
default:
log_error("Unable to load height map image: %s", e.what());
break;
}
return false;
}