From ae9cf7dfbe08cf565623ca0c206e03018ac063b2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sun, 22 May 2016 11:47:54 +0200
Subject: [PATCH] Draw flat-up / down-flat

---
 src/ride/thrill/go_karts.c | 63 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/src/ride/thrill/go_karts.c b/src/ride/thrill/go_karts.c
index dd3af6a0ab..0e3ded857b 100644
--- a/src/ride/thrill/go_karts.c
+++ b/src/ride/thrill/go_karts.c
@@ -29,10 +29,19 @@ enum
 	SPR_GO_KARTS_FLAT_FRONT_SW_NE = 20754,
 	SPR_GO_KARTS_FLAT_FRONT_NW_SE = 20755,
 
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_SW_NE = 20772,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_NW_SE = 20773,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_NE_SW = 20774,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_SE_NW = 20775,
+
 	SPR_GO_KARTS_25_DEG_UP_SW_NE = 20780,
 	SPR_GO_KARTS_25_DEG_UP_NW_SE = 20781,
 	SPR_GO_KARTS_25_DEG_UP_NE_SW = 20782,
 	SPR_GO_KARTS_25_DEG_UP_SE_NW = 20783,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_SW_NE = 20784,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_NW_SE = 20785,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_NE_SW = 20786,
+	SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_SE_NW = 20787,
 
 	SPR_GO_KARTS_25_DEG_UP_FRONT_SW_NE = 20792,
 	SPR_GO_KARTS_25_DEG_UP_FRONT_NW_SE = 20793,
@@ -47,6 +56,13 @@ static const uint32 go_karts_track_pieces_25_deg_up[4][2] = {
 	{SPR_GO_KARTS_25_DEG_UP_SE_NW, SPR_GO_KARTS_25_DEG_UP_FRONT_SE_NW},
 };
 
+static const uint32 go_karts_track_pieces_flat_to_25_deg_up[4][2] = {
+	{SPR_GO_KARTS_FLAT_TO_25_DEG_UP_SW_NE, SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_SW_NE},
+	{SPR_GO_KARTS_FLAT_TO_25_DEG_UP_NW_SE, SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_NW_SE},
+	{SPR_GO_KARTS_FLAT_TO_25_DEG_UP_NE_SW, SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_NE_SW},
+	{SPR_GO_KARTS_FLAT_TO_25_DEG_UP_SE_NW, SPR_GO_KARTS_FLAT_TO_25_DEG_UP_FRONT_SE_NW},
+};
+
 /** rct2: 0x0074A748 */
 static void paint_go_karts_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
 {
@@ -122,9 +138,51 @@ static void paint_go_karts_track_25_deg_up(uint8 rideIndex, uint8 trackSequence,
 	paint_util_set_general_support_height(height + 56, 0x20);
 }
 
-/** rct2: 0x */
+/** rct2: 0x0074A768 */
 static void paint_go_karts_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
 {
+	uint32 imageId;
+	paint_struct * ps;
+
+	imageId = go_karts_track_pieces_flat_to_25_deg_up[direction][0] | RCT2_GLOBAL(0x00F44198, uint32);
+	if (direction == 0 || direction == 2) {
+		ps = sub_98197C(imageId, 0, 0, 32, 28, 1, height, 0, 2, height, get_current_rotation());
+	} else {
+		ps = sub_98197C(imageId, 0, 0, 28, 32, 1, height, 2, 0, height, get_current_rotation());
+	}
+
+	if (direction == 1 || direction == 2) {
+		RCT2_GLOBAL(0x009DEA58, paint_struct*) = ps;
+	}
+
+	imageId = go_karts_track_pieces_flat_to_25_deg_up[direction][1] | RCT2_GLOBAL(0x00F44198, uint32);
+	if (direction == 0 || direction == 2) {
+		sub_98197C(imageId, 0, 0, 32, 1, 11, height, 0, 29, height + 2, get_current_rotation());
+	} else {
+		sub_98197C(imageId, 0, 0, 1, 32, 1, height, 29, 0, height + 2, get_current_rotation());
+	}
+
+	switch (direction) {
+		case 0:
+			wooden_a_supports_paint_setup(0, 1, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL);
+			paint_util_push_tunnel_left(height, TUNNEL_6);
+			break;
+		case 1:
+			wooden_a_supports_paint_setup(1, 2, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL);
+			paint_util_push_tunnel_right(height, TUNNEL_8);
+			break;
+		case 2:
+			wooden_a_supports_paint_setup(0, 3, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL);
+			paint_util_push_tunnel_left(height, TUNNEL_8);
+			break;
+		case 3:
+			wooden_a_supports_paint_setup(1, 4, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL);
+			paint_util_push_tunnel_right(height, TUNNEL_6);
+			break;
+	}
+
+	paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
+	paint_util_set_general_support_height(height + 48, 0x20);
 }
 
 /** rct2: 0x */
@@ -143,9 +201,10 @@ static void paint_go_karts_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trac
 {
 }
 
-/** rct2: 0x */
+/** rct2: 0x0074A7A8 */
 static void paint_go_karts_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
 {
+	paint_go_karts_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement);
 }
 
 /** rct2: 0x */