From f7c7a5bace77ce82caaa704cf0290db6904ec005 Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 16 Nov 2017 19:11:10 +0000 Subject: [PATCH] Fix build --- src/openrct2/paint/paint.h | 1 + src/openrct2/paint/tile_element/tile_element.c | 4 ++-- src/openrct2/ride/transport/MiniatureRailway.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/paint.h index e0110149f7..7efe33d29d 100644 --- a/src/openrct2/paint/paint.h +++ b/src/openrct2/paint/paint.h @@ -170,6 +170,7 @@ typedef struct paint_session tunnel_entry RightTunnels[TUNNEL_MAX_COUNT]; uint8 RightTunnelCount; uint8 VerticalTunnelHeight; + rct_tile_element * SurfaceElement; rct_tile_element * PathElementOnSameHeight; rct_tile_element * TrackElementOnSameHeight; bool DidPassSurface; diff --git a/src/openrct2/paint/tile_element/tile_element.c b/src/openrct2/paint/tile_element/tile_element.c index 62aefb369d..bbb700a5f1 100644 --- a/src/openrct2/paint/tile_element/tile_element.c +++ b/src/openrct2/paint/tile_element/tile_element.c @@ -250,13 +250,13 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) session->PathElementOnSameHeight = 0; session->TrackElementOnSameHeight = 0; rct_tile_element * tile_element_sub_iterator = tile_element; - while (!map_element_is_last_for_tile(tile_element_sub_iterator++)) + while (!tile_element_is_last_for_tile(tile_element_sub_iterator++)) { if (tile_element_sub_iterator->base_height != tile_element->base_height) { break; } - switch (map_element_get_type(tile_element_sub_iterator)) + switch (tile_element_get_type(tile_element_sub_iterator)) { case TILE_ELEMENT_TYPE_PATH: session->PathElementOnSameHeight = tile_element_sub_iterator; diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 49aee07b9b..cea941062b 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -558,7 +558,7 @@ static uint32 miniature_railway_track_to_grooved(uint32 imageId) return imageId - SPR_MINIATURE_RAILWAY_FLAT_SW_NE + SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE; } -static uint32 miniature_railway_track_to_grooved_indent(uint32 imageId, rct_map_element *path, uint8 direction) +static uint32 miniature_railway_track_to_grooved_indent(uint32 imageId, rct_tile_element *path, uint8 direction) { if (!path) {