From bcfe5026472e504b0e6f68dc4af8586541f406bd Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Tue, 16 Sep 2014 22:09:47 +0100 Subject: [PATCH 1/2] Fixes half drawn doors in scenery window --- src/window_scenery.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/window_scenery.c b/src/window_scenery.c index 886fd5b083..3ed8744b9e 100644 --- a/src/window_scenery.c +++ b/src/window_scenery.c @@ -1088,6 +1088,12 @@ void window_scenery_scrollpaint() if (sceneryEntry->wall.flags & WALL_SCENERY_HAS_SECONDARY_COLOUR) { imageId |= (window_scenery_secondary_colour << 24) | 0x80000000; } + gfx_draw_sprite(clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32, + tertiaryColour); + + imageId = (sceneryEntry->image + 0x40000006) | (window_scenery_primary_colour << 19); + gfx_draw_sprite(clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32, + tertiaryColour); } else { imageId |= (window_scenery_primary_colour << 19) | 0x20000000; @@ -1100,11 +1106,17 @@ void window_scenery_scrollpaint() tertiaryColour = window_scenery_tertiary_colour; } + } + gfx_draw_sprite(clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32, + tertiaryColour); + + if (sceneryEntry->wall.flags & WALL_SCENERY_FLAG5){ + gfx_draw_sprite(clipdpi, imageId + 1, 0x2F, (sceneryEntry->wall.height * 2) + 0x32, + tertiaryColour); } } - gfx_draw_sprite(clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32, - tertiaryColour); + rct2_free(clipdpi); } } From eded73c5fbece27e811d9c3c9f6617804a1bc6bd Mon Sep 17 00:00:00 2001 From: Adrian Wielgosik Date: Thu, 18 Sep 2014 00:05:28 +0200 Subject: [PATCH 2/2] Fix footpath construction arrow not showing up --- src/window_footpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/window_footpath.c b/src/window_footpath.c index 1e70c75998..b2f06656d9 100644 --- a/src/window_footpath.c +++ b/src/window_footpath.c @@ -391,7 +391,7 @@ static void window_footpath_toolupdate() if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) { window_footpath_set_provisional_path_at_point(x, y); } else if (widgetIndex == WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL) { - RCT2_CALLPROC_X(0x006A8388, 0, 0, 0, 0, (int)w, 0, 0); + RCT2_CALLPROC_X(0x006A8388, x, y, 0, 0, (int)w, 0, 0); } }