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

Convert small scenery support flag to allow use of new colors

Browse Source
This commit is contained in:
Trevor Finney
2023-02-21 14:05:37 -05:00
parent 771af66a74
commit 4b87f9a2e1
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/park/ParkFile.h
View File

@@ -9,7 +9,7 @@ struct ObjectRepositoryItem;
namespace OpenRCT2
{
// Current version that is saved.
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 24;
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 25;
// The minimum version that is forwards compatible with the current version.
constexpr uint32_t PARK_FILE_MIN_VERSION = 24;

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1706,9 +1706,9 @@ namespace RCT1
dst2->SetEntryIndex(entryIndex);
dst2->SetAge(src2->GetAge());
dst2->SetSceneryQuadrant(src2->GetSceneryQuadrant());
dst2->SetPrimaryColour(RCT1::GetColour(src2->GetPrimaryColour()));
if (src2->NeedsSupports())
dst2->SetNeedsSupports();
dst2->SetPrimaryColour(RCT1::GetColour(src2->GetPrimaryColour()) & RCT12_TILE_ELEMENT_COLOUR_MASK);
// Copied from [rct2: 0x006A2956]
switch (src2->GetEntryIndex())

2
src/openrct2/rct2/S6Importer.cpp
View File

@@ -1484,10 +1484,10 @@ namespace RCT2
dst2->SetEntryIndex(src2->GetEntryIndex());
dst2->SetAge(src2->GetAge());
dst2->SetSceneryQuadrant(src2->GetSceneryQuadrant());
dst2->SetPrimaryColour(src2->GetPrimaryColour());
dst2->SetSecondaryColour(src2->GetSecondaryColour());
if (src2->NeedsSupports())
dst2->SetNeedsSupports();
dst2->SetPrimaryColour(src2->GetPrimaryColour() & RCT12_TILE_ELEMENT_COLOUR_MASK);
break;
}