1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00

Fix #20356: Cannot set tertiary colour on small scenery (#20803)

This commit is contained in:
Michael Steenbeek
2023-09-23 06:30:47 +02:00
committed by GitHub
parent a070604d7b
commit e94dc57d32
4 changed files with 7 additions and 3 deletions

View File

@@ -3,6 +3,7 @@
- Feature: [#20141] Add additional track pieces to the Giga Coaster.
- Feature: [OpenMusic#46] Added Mystic ride music style.
- Change: [#20790] Default ride price set to free if park charges for entry.
- Fix: [#20356] Cannot set tertiary colour on small scenery.
- Fix: [#20737] Spent money in player window underflows when getting refunds.
- Fix: [#20778] [Plugin] Incorrect target api when executing custom actions.
- Fix: [#19722] “Forbid tree removal” restriction doesn't forbid removal of large scenery tree items.

View File

@@ -49,6 +49,7 @@ void SmallSceneryPlaceAction::AcceptParameters(GameActionParameterVisitor& visit
visitor.Visit("object", _sceneryType);
visitor.Visit("primaryColour", _primaryColour);
visitor.Visit("secondaryColour", _secondaryColour);
visitor.Visit("tertiaryColour", _tertiaryColour);
}
uint32_t SmallSceneryPlaceAction::GetCooldownTime() const
@@ -65,7 +66,8 @@ void SmallSceneryPlaceAction::Serialise(DataSerialiser& stream)
{
GameAction::Serialise(stream);
stream << DS_TAG(_loc) << DS_TAG(_quadrant) << DS_TAG(_sceneryType) << DS_TAG(_primaryColour) << DS_TAG(_secondaryColour);
stream << DS_TAG(_loc) << DS_TAG(_quadrant) << DS_TAG(_sceneryType) << DS_TAG(_primaryColour) << DS_TAG(_secondaryColour)
<< DS_TAG(_tertiaryColour);
}
GameActions::Result SmallSceneryPlaceAction::Query() const

View File

@@ -55,7 +55,8 @@ void SmallScenerySetColourAction::Serialise(DataSerialiser& stream)
{
GameAction::Serialise(stream);
stream << DS_TAG(_loc) << DS_TAG(_quadrant) << DS_TAG(_sceneryType) << DS_TAG(_primaryColour) << DS_TAG(_secondaryColour);
stream << DS_TAG(_loc) << DS_TAG(_quadrant) << DS_TAG(_sceneryType) << DS_TAG(_primaryColour) << DS_TAG(_secondaryColour)
<< DS_TAG(_tertiaryColour);
}
GameActions::Result SmallScenerySetColourAction::Query() const

View File

@@ -43,7 +43,7 @@
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "3"
#define NETWORK_STREAM_VERSION "4"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION