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

Merge pull request #16831 from IntelOrca/feature/ternary-scenery-colours

Browse Source 
Implement tertiary colours for small and large scenery objects.
This commit is contained in:
Ted John
2022-03-20 19:24:47 +00:00
committed by GitHub
parent e78c29ea5c 793acf67ae
commit fc2ed95641
21 changed files with 169 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/ride/TrackDesign.cpp
View File

@@ -1086,7 +1086,7 @@ static GameActions::Result TrackDesignPlaceSceneryElement(
auto smallSceneryPlace = SmallSceneryPlaceAction(
{ mapCoord.x, mapCoord.y, z, rotation }, quadrant, entryInfo->Index, scenery.primary_colour,
scenery.secondary_colour);
scenery.secondary_colour, COLOUR_DARK_BROWN);
smallSceneryPlace.SetFlags(flags);
auto res = flags & GAME_COMMAND_FLAG_APPLY ? GameActions::ExecuteNested(&smallSceneryPlace)
@@ -1127,7 +1127,8 @@ static GameActions::Result TrackDesignPlaceSceneryElement(
flags |= GAME_COMMAND_FLAG_REPLAY;
}
auto sceneryPlaceAction = LargeSceneryPlaceAction(
{ mapCoord.x, mapCoord.y, z, rotation }, entryInfo->Index, scenery.primary_colour, scenery.secondary_colour);
{ mapCoord.x, mapCoord.y, z, rotation }, entryInfo->Index, scenery.primary_colour, scenery.secondary_colour,
COLOUR_DARK_BROWN);
sceneryPlaceAction.SetFlags(flags);
auto res = flags & GAME_COMMAND_FLAG_APPLY ? GameActions::ExecuteNested(&sceneryPlaceAction)
: GameActions::QueryNested(&sceneryPlaceAction);