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

Name glass palettes

Browse Source
This commit is contained in:
Marijn van der Werf
2016-11-09 23:40:13 +01:00
parent 2109763267
commit 4f47808201
9 changed files with 144 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows/error.c
View File

@@ -162,7 +162,7 @@ static void window_error_paint(rct_window *w, rct_drawpixelinfo *dpi)
b = w->y + w->height - 1;
gfx_filter_rect(dpi, l + 1, t + 1, r - 1, b - 1, PALETTE_45);
gfx_filter_rect(dpi, l, t, r, b, PALETTE_139);
gfx_filter_rect(dpi, l, t, r, b, PALETTE_GLASS_SATURATED_RED);
gfx_filter_rect(dpi, l, t + 2, l, b - 2, PALETTE_47);
gfx_filter_rect(dpi, r, t + 2, r, b - 2, PALETTE_47);

2
src/windows/ride.c
View File

@@ -4689,7 +4689,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi)
terniaryColour = 0;
if (entranceStyle->base_image_id & 0x40000000) {
terniaryColour = 0x40000000 | ((trackColour.main + 112) << 19);
terniaryColour = 0x40000000 | (GlassPaletteIds[trackColour.main] << 19);
}
spriteIndex = (trackColour.additional << 24) | (trackColour.main << 19);

4
src/windows/scenery.c
View File

@@ -1147,7 +1147,7 @@ void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrol
gfx_draw_sprite(&clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32,
tertiaryColour);
imageId = (sceneryEntry->image + 0x40000006) | ((gWindowSceneryPrimaryColour + 0x70) << 19);
imageId = (sceneryEntry->image + 0x40000006) | (GlassPaletteIds[gWindowSceneryPrimaryColour] << 19);
gfx_draw_sprite(&clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32,
tertiaryColour);
}
@@ -1202,7 +1202,7 @@ void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrol
if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_GLASS) {
imageId = ((sceneryEntry->image + gWindowSceneryRotation) + 0x40000004) +
((gWindowSceneryPrimaryColour + 0x70) << 19);
(GlassPaletteIds[gWindowSceneryPrimaryColour] << 19);
gfx_draw_sprite(&clipdpi, imageId, 0x20, spriteTop, w->colours[1]);
}

2
src/windows/tooltip.c
View File

@@ -195,7 +195,7 @@ static void window_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Background
gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, PALETTE_45);
gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, PALETTE_132);
gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, PALETTE_GLASS_LIGHT_ORANGE);
// Sides
gfx_filter_rect(dpi, left + 0, top + 2, left + 0, bottom - 2, PALETTE_47);