1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00

Merge pull request #16924

This commit is contained in:
Hielke Morsink
2022-04-06 09:40:26 +02:00
committed by GitHub

View File

@@ -830,19 +830,6 @@ public:
window_invalidate_by_class(WC_SCENERY);
}
void SetDefaultPlacementConfiguration()
{
gWindowSceneryRotation = 3;
gWindowSceneryPrimaryColour = COLOUR_BORDEAUX_RED;
gWindowScenerySecondaryColour = COLOUR_YELLOW;
gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
Init();
gWindowSceneryTabSelections.clear();
gWindowSceneryActiveTabIndex = 0;
}
private:
int32_t GetNumColumns() const
{
@@ -1394,11 +1381,13 @@ void WindowSceneryResetSelectedSceneryItems()
void WindowScenerySetDefaultPlacementConfiguration()
{
auto* w = static_cast<SceneryWindow*>(window_find_by_class(WC_SCENERY));
if (w != nullptr)
{
w->SetDefaultPlacementConfiguration();
}
gWindowSceneryRotation = 3;
gWindowSceneryPrimaryColour = COLOUR_BORDEAUX_RED;
gWindowScenerySecondaryColour = COLOUR_YELLOW;
gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
gWindowSceneryTabSelections.clear();
gWindowSceneryActiveTabIndex = 0;
}
void WindowSceneryInit()