From e8e203983267425503fe0f6c84cf805b5116ea1a Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 23 Oct 2016 14:47:40 +0200 Subject: [PATCH] Fix GCC --- src/ride/coaster/junior_roller_coaster.c | 12 +++--------- src/ride/water/water_coaster.c | 13 ------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/ride/coaster/junior_roller_coaster.c b/src/ride/coaster/junior_roller_coaster.c index 4b3f96a996..061e739d72 100644 --- a/src/ride/coaster/junior_roller_coaster.c +++ b/src/ride/coaster/junior_roller_coaster.c @@ -1804,13 +1804,9 @@ void junior_rc_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dire paint_util_set_general_support_height(height + 32, 0x20); } -void junior_rc_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, uint8 rideType) { - rct_ride * ride = get_ride(rideIndex); - const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - uint32 imageId = entranceStyle->base_image_id; - if (!(gTrackColours[SCHEME_MISC] & (1 << 29))) { - imageId &= 0x7FFFF; - } +void junior_rc_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, uint8 rideType) +{ + uint32 imageId; bool isBraked = (bool)(mapElement->flags & MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); @@ -1918,8 +1914,6 @@ void junior_rc_paint_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequenc paint_util_push_tunnel_left(tunnelHeight, tunnelType); } - const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; - if (track_paint_util_should_paint_supports(gPaintMapPosition)) { int supportType = direction & 1 ? 2 : 1; metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); diff --git a/src/ride/water/water_coaster.c b/src/ride/water/water_coaster.c index 8a073149cc..f01fe6ff3b 100644 --- a/src/ride/water/water_coaster.c +++ b/src/ride/water/water_coaster.c @@ -16,22 +16,9 @@ #include "../../common.h" #include "../coaster/junior_roller_coaster.h" -#include "../../common.h" -#include "../../interface/viewport.h" -#include "../../paint/supports.h" -#include "../../paint/paint.h" #include "../track.h" #include "../track_paint.h" -static const uint8 water_rc_diag_support_segment[] = {1, 0, 2, 3}; - -static const int water_rc_diag_blocked_segments[] = { - SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4 | SEGMENT_BC, - SEGMENT_C4 | SEGMENT_CC | SEGMENT_C8 | SEGMENT_B4, - SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4, - SEGMENT_D0 | SEGMENT_C4 | SEGMENT_B8 | SEGMENT_C8 -}; - static void water_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement);