mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix small scenery repainting (#19826) 

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
This commit is contained in:
kyphii 2023-04-05 00:27:51 -04:00 committed by GitHub
parent 81fd7b6b8a
commit 1dafb8e56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1100,7 +1100,7 @@ namespace OpenRCT2
}
}
else if (
it.element->GetType() == TileElementType::SmallScenery && os.GetHeader().TargetVersion < 22)
it.element->GetType() == TileElementType::SmallScenery && os.GetHeader().TargetVersion < 23)
{
auto* sceneryElement = it.element->AsSmallScenery();
// Previous formats stored the needs supports flag in the primary colour

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 = 22;
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 23;
// The minimum version that is forwards compatible with the current version.
constexpr uint32_t PARK_FILE_MIN_VERSION = 22;

6
src/openrct2/world/SmallScenery.cpp
View File

@ -97,19 +97,19 @@ colour_t SmallSceneryElement::GetTertiaryColour() const
void SmallSceneryElement::SetPrimaryColour(colour_t newColour)
{
assert(newColour < COLOUR_COUNT);
Colour[0] |= newColour;
Colour[0] = newColour;
}
void SmallSceneryElement::SetSecondaryColour(colour_t newColour)
{
assert(newColour < COLOUR_COUNT);
Colour[1] |= newColour;
Colour[1] = newColour;
}
void SmallSceneryElement::SetTertiaryColour(colour_t newColour)
{
assert(newColour < COLOUR_COUNT);
Colour[2] |= newColour;
Colour[2] = newColour;
}
bool SmallSceneryElement::NeedsSupports() const