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

Fix applying palette colours; SPRITE_ID_PALETTE_COLOUR_3 to _2

Browse Source
This commit is contained in:
rwjuk
2017-07-28 00:03:33 +01:00
committed by Michael Steenbeek
parent 222782b228
commit 315ee6b3b5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/paint/map_element/scenery.c
View File

@@ -121,7 +121,7 @@ void scenery_paint(uint8 direction, sint32 height, rct_map_element* mapElement)
{ {
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR) if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR)
{ {
baseImageid |= SPRITE_ID_PALETTE_COLOUR_3(scenery_small_get_primary_colour(mapElement), baseImageid |= SPRITE_ID_PALETTE_COLOUR_2(scenery_small_get_primary_colour(mapElement),
scenery_small_get_secondary_colour(mapElement)); scenery_small_get_secondary_colour(mapElement));
} }
else else
@@ -244,7 +244,7 @@ void scenery_paint(uint8 direction, sint32 height, rct_map_element* mapElement)
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_PRIMARY_COLOUR) if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_PRIMARY_COLOUR)
{ {
if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR) { if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR) {
image_id |= SPRITE_ID_PALETTE_COLOUR_3(scenery_small_get_primary_colour(mapElement), image_id |= SPRITE_ID_PALETTE_COLOUR_2(scenery_small_get_primary_colour(mapElement),
scenery_small_get_secondary_colour(mapElement)); scenery_small_get_secondary_colour(mapElement));
} }
else else