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

Merge pull request #16842 from IntelOrca/fix/large-scenery-colours 

Fix custom large scenery appearing black.
This commit is contained in:
Ted John 2022-03-25 22:15:15 +00:00 committed by GitHub
parent 36e1a10431 313d46489e
commit d6d61ddd44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/object/LargeSceneryObject.cpp
View File

@ -67,6 +67,15 @@ void LargeSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
context->LogError(ObjectError::InvalidProperty, "Sell price can not be more than buy price.");
}
}
// RCT2 would always remap primary and secondary colours for large scenery
// This meant some custom large scenery objects did not get exported with the required flags, because they still
// functioned, but without the ability to change the colours when the object was selected in the scenery window.
// OpenRCT2 changes the rendering so that the flags are required, we therefore have to assume all custom objects
// can be recoloured. The minor drawback to this, is that some custom large scenery will have the option to change
// the primary and secondary colour, however no effect will be seen.
_legacyType.flags |= LARGE_SCENERY_FLAG_HAS_PRIMARY_COLOUR;
_legacyType.flags |= LARGE_SCENERY_FLAG_HAS_SECONDARY_COLOUR;
}
void LargeSceneryObject::Load()