From cc92300e3a38a740f93954c5c72d6b5a988eb0af Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Tue, 11 Apr 2017 19:53:52 +0200
Subject: [PATCH] Load CSG1 booster sprites for the Looping and Corkscrew RC

---
 .../ride/coaster/corkscrew_roller_coaster.c   | 35 ++++++++++++++++++-
 .../ride/coaster/looping_roller_coaster.c     | 33 ++++++++++++++++-
 test/testpaint/compat.c                       |  5 +++
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/ride/coaster/corkscrew_roller_coaster.c b/src/openrct2/ride/coaster/corkscrew_roller_coaster.c
index c89d3b4e05..5b4fd42bef 100644
--- a/src/openrct2/ride/coaster/corkscrew_roller_coaster.c
+++ b/src/openrct2/ride/coaster/corkscrew_roller_coaster.c
@@ -5863,6 +5863,39 @@ static void corkscrew_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence
 	paint_util_set_general_support_height(height + 32, 0x20);
 }
 
+static void corkscrew_rc_track_booster(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
+{
+	if (!is_csg_loaded())
+	{
+		corkscrew_rc_track_brakes(rideIndex, trackSequence, direction, height, mapElement);
+		return;
+	}
+
+	uint32 sprite_ne_sw_behind = SPR_CSG_BEGIN + 56213;
+	uint32 sprite_nw_se_behind = SPR_CSG_BEGIN + 56214;
+	uint32 sprite_ne_sw_after = SPR_CSG_BEGIN + 56215;
+	uint32 sprite_nw_se_after = SPR_CSG_BEGIN + 56216;
+
+	switch (direction) {
+		case 0:
+		case 2:
+			sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_ne_sw_behind, 0, 0, 32, 20, 3, height, 0, 6, height);
+			sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_ne_sw_after, 0, 0, 32, 1, 26, height, 0, 27, height);
+			break;
+		case 1:
+		case 3:
+			sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_nw_se_behind, 0, 0, 32, 20, 3, height, 0, 6, height);
+			sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_nw_se_after, 0, 0, 32, 1, 26, height, 0, 27, height);
+			break;
+	}
+	if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
+		metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
+	}
+	paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
+	paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
+	paint_util_set_general_support_height(height + 32, 0x20);
+}
+
 TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(sint32 trackType, sint32 direction)
 {
 	switch (trackType) {
@@ -6086,7 +6119,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(sint32 trackType, sin
 		return corkscrew_rc_track_block_brakes;
 
 	case TRACK_ELEM_BOOSTER:
-		return corkscrew_rc_track_brakes;
+		return corkscrew_rc_track_booster;
 	}
 	return NULL;
 }
diff --git a/src/openrct2/ride/coaster/looping_roller_coaster.c b/src/openrct2/ride/coaster/looping_roller_coaster.c
index bccc7e897a..a2bc5e6170 100644
--- a/src/openrct2/ride/coaster/looping_roller_coaster.c
+++ b/src/openrct2/ride/coaster/looping_roller_coaster.c
@@ -6278,6 +6278,36 @@ static void looping_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, u
 	looping_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement);
 }
 
+static void looping_rc_track_booster(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
+{
+	if (!is_csg_loaded())
+	{
+		looping_rc_track_brakes(rideIndex, trackSequence, direction, height, mapElement);
+		return;
+	}
+
+	uint32 sprite_ne_sw = SPR_CSG_BEGIN + 55679;
+	uint32 sprite_nw_se = SPR_CSG_BEGIN + 55680;
+
+
+	switch (direction) {
+		case 0:
+		case 2:
+			sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_ne_sw, 0, 0, 32, 20, 3, height, 0, 6, height);
+			break;
+		case 1:
+		case 3:
+			sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_nw_se, 0, 0, 32, 20, 3, height, 0, 6, height);
+			break;
+	}
+	if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
+		metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
+	}
+	paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
+	paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
+	paint_util_set_general_support_height(height + 32, 0x20);
+}
+
 TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(sint32 trackType, sint32 direction)
 {
 	switch (trackType) {
@@ -6553,7 +6583,8 @@ TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(sint32 trackType, sint3
 		return looping_rc_track_right_banked_25_deg_down_to_flat;
 
 	case TRACK_ELEM_BOOSTER:
-		return looping_rc_track_brakes;
+		return looping_rc_track_booster;
+
 	}
 	return NULL;
 }
diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c
index 9260c53e97..c1528722ad 100644
--- a/test/testpaint/compat.c
+++ b/test/testpaint/compat.c
@@ -165,3 +165,8 @@ bool track_element_is_inverted(rct_map_element *trackElement)
 {
 	return trackElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED;
 }
+
+bool is_csg_loaded()
+{
+	return false;
+}