mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

More code review changes

Browse Source
This commit is contained in:
Ted John
2022-02-14 23:20:19 +00:00
parent 6d337a15c4
commit 44294119c9
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/Editor.cpp
View File

@@ -94,7 +94,7 @@ namespace Editor
{ {
OpenRCT2::Audio::StopAll(); OpenRCT2::Audio::StopAll();
object_list_load(); object_list_load();
OpenRCT2::GetContext()->GetGameState()->InitAll({ 150, 150 }); OpenRCT2::GetContext()->GetGameState()->InitAll(DEFAULT_MAP_SIZE);
gScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR; gScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR;
gEditorStep = EditorStep::ObjectSelection; gEditorStep = EditorStep::ObjectSelection;
gParkFlags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; gParkFlags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
@@ -170,7 +170,7 @@ namespace Editor
object_manager_unload_all_objects(); object_manager_unload_all_objects();
object_list_load(); object_list_load();
OpenRCT2::GetContext()->GetGameState()->InitAll({ 150, 150 }); OpenRCT2::GetContext()->GetGameState()->InitAll(DEFAULT_MAP_SIZE);
SetAllLandOwned(); SetAllLandOwned();
gEditorStep = EditorStep::ObjectSelection; gEditorStep = EditorStep::ObjectSelection;
viewport_init_all(); viewport_init_all();
@@ -191,7 +191,7 @@ namespace Editor
object_manager_unload_all_objects(); object_manager_unload_all_objects();
object_list_load(); object_list_load();
OpenRCT2::GetContext()->GetGameState()->InitAll({ 150, 150 }); OpenRCT2::GetContext()->GetGameState()->InitAll(DEFAULT_MAP_SIZE);
SetAllLandOwned(); SetAllLandOwned();
gEditorStep = EditorStep::ObjectSelection; gEditorStep = EditorStep::ObjectSelection;
viewport_init_all(); viewport_init_all();

28
src/openrct2/interface/Screenshot.cpp
View File

@@ -216,9 +216,9 @@ enum class EdgeType
static CoordsXY GetEdgeTile(TileCoordsXY mapSize, int32_t rotation, EdgeType edgeType, bool visible) static CoordsXY GetEdgeTile(TileCoordsXY mapSize, int32_t rotation, EdgeType edgeType, bool visible)
{ {
// TODO
int32_t lower = (visible ? 1 : 0) * COORDS_XY_STEP; int32_t lower = (visible ? 1 : 0) * COORDS_XY_STEP;
int32_t upper = (visible ? mapSize.x - 2 : mapSize.x - 1) * COORDS_XY_STEP; int32_t upperX = (visible ? mapSize.x - 2 : mapSize.x - 1) * COORDS_XY_STEP;
int32_t upperY = (visible ? mapSize.y - 2 : mapSize.y - 1) * COORDS_XY_STEP;
switch (edgeType) switch (edgeType)
{ {
default: default:
@@ -227,11 +227,11 @@ static CoordsXY GetEdgeTile(TileCoordsXY mapSize, int32_t rotation, EdgeType edg
{ {
default: default:
case 0: case 0:
return { upper, lower }; return { upperX, lower };
case 1: case 1:
return { upper, upper }; return { upperX, upperY };
case 2: case 2:
return { lower, upper }; return { lower, upperY };
case 3: case 3:
return { lower, lower }; return { lower, lower };
} }
@@ -242,37 +242,37 @@ static CoordsXY GetEdgeTile(TileCoordsXY mapSize, int32_t rotation, EdgeType edg
case 0: case 0:
return { lower, lower }; return { lower, lower };
case 1: case 1:
return { upper, lower }; return { upperX, lower };
case 2: case 2:
return { upper, upper }; return { upperX, upperY };
case 3: case 3:
return { lower, upper }; return { lower, upperY };
} }
case EdgeType::RIGHT: case EdgeType::RIGHT:
switch (rotation) switch (rotation)
{ {
default: default:
case 0: case 0:
return { lower, upper }; return { lower, upperY };
case 1: case 1:
return { lower, lower }; return { lower, lower };
case 2: case 2:
return { upper, lower }; return { upperX, lower };
case 3: case 3:
return { upper, upper }; return { upperX, upperY };
} }
case EdgeType::BOTTOM: case EdgeType::BOTTOM:
switch (rotation) switch (rotation)
{ {
default: default:
case 0: case 0:
return { upper, upper }; return { upperX, upperY };
case 1: case 1:
return { lower, upper }; return { lower, upperY };
case 2: case 2:
return { lower, lower }; return { lower, lower };
case 3: case 3:
return { upper, lower }; return { upperY, lower };
} }
} }
} }