diff --git a/src/ride/track_data.c b/src/ride/track_data.c index 7d197c85c9..0ba29150dc 100644 --- a/src/ride/track_data.c +++ b/src/ride/track_data.c @@ -6246,7 +6246,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = { get_track_paint_function_suspended_swinging_rc, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER get_track_paint_function_inverted_rc, // RIDE_TYPE_INVERTED_ROLLER_COASTER get_track_paint_function_junior_rc, // RIDE_TYPE_JUNIOR_ROLLER_COASTER - get_track_paint_function_minature_railway, // RIDE_TYPE_MINIATURE_RAILWAY + get_track_paint_function_miniature_railway, // RIDE_TYPE_MINIATURE_RAILWAY get_track_paint_function_monorail, // RIDE_TYPE_MONORAIL get_track_paint_function_mini_suspended_rc, // RIDE_TYPE_MINI_SUSPENDED_COASTER get_track_paint_function_boat_ride, // RIDE_TYPE_BOAT_RIDE diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index a3b15d8cbb..ddc6eceac2 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -311,7 +311,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_inverted_rc(int trackType, int dir TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_monorail(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_minature_railway(int trackType, int direction); +TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(int trackType, int direction); diff --git a/src/ride/transport/minature_railway.c b/src/ride/transport/minature_railway.c index c2f4513877..83af92157e 100644 --- a/src/ride/transport/minature_railway.c +++ b/src/ride/transport/minature_railway.c @@ -26,102 +26,102 @@ enum { - SPR_MINATURE_RAILWAY_FLAT_SW_NE = 23341, - SPR_MINATURE_RAILWAY_FLAT_NW_SE = 23342, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_0 = 23343, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_1 = 23344, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_2 = 23345, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_3 = 23346, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_4 = 23347, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_0 = 23348, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_1 = 23349, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_2 = 23350, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_3 = 23351, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_4 = 23352, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_0 = 23353, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_1 = 23354, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_2 = 23355, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_3 = 23356, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_4 = 23357, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_0 = 23358, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_1 = 23359, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_2 = 23360, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_3 = 23361, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_4 = 23362, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_0 = 23363, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_1 = 23364, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_2 = 23365, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_3 = 23366, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_0 = 23367, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_1 = 23368, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_2 = 23369, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_3 = 23370, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_0 = 23371, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_1 = 23372, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_2 = 23373, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_3 = 23374, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_0 = 23375, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_1 = 23376, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_2 = 23377, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_3 = 23378, - SPR_MINATURE_RAILWAY_25_DEG_UP_SW_NE = 23379, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_SW_NE = 23380, - SPR_MINATURE_RAILWAY_25_DEG_UP_NE_SW = 23381, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_NE_SW = 23382, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_NE_SW = 23383, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_SW_NE = 23384, - SPR_MINATURE_RAILWAY_25_DEG_UP_NW_SE = 23385, - SPR_MINATURE_RAILWAY_25_DEG_UP_SE_NW = 23386, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_NW_SE = 23387, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_SE_NW = 23388, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_SE_NW = 23389, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_NW_SE = 23390, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_0 = 23391, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_1 = 23392, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_2 = 23393, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_0 = 23394, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_1 = 23395, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_2 = 23396, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_0 = 23397, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_1 = 23398, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_2 = 23399, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_0 = 23400, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_1 = 23401, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_2 = 23402, - SPR_MINATURE_RAILWAY_FLAT_NO_BASE_SW_NE = 23403, - SPR_MINATURE_RAILWAY_FLAT_NO_BASE_NW_SE = 23404, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_0 = 23405, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_1 = 23406, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_2 = 23407, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_3 = 23408, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_0 = 23409, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_1 = 23410, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_2 = 23411, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_3 = 23412, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_0 = 23413, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_1 = 23414, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_2 = 23415, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_3 = 23416, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_0 = 23417, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_1 = 23418, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_2 = 23419, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_3 = 23420, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_0 = 23421, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_1 = 23422, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_2 = 23423, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_3 = 23424, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_0 = 23425, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_1 = 23426, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_2 = 23427, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_3 = 23428, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_0 = 23429, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_1 = 23430, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_2 = 23431, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_3 = 23432, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_0 = 23433, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_1 = 23434, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_2 = 23435, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_3 = 23436, + SPR_MINIATURE_RAILWAY_FLAT_SW_NE = 23341, + SPR_MINIATURE_RAILWAY_FLAT_NW_SE = 23342, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_0 = 23343, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_1 = 23344, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_2 = 23345, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_3 = 23346, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_4 = 23347, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_0 = 23348, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_1 = 23349, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_2 = 23350, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_3 = 23351, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_4 = 23352, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_0 = 23353, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_1 = 23354, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_2 = 23355, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_3 = 23356, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_4 = 23357, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_0 = 23358, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_1 = 23359, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_2 = 23360, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_3 = 23361, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_4 = 23362, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_0 = 23363, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_1 = 23364, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_2 = 23365, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_3 = 23366, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_0 = 23367, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_1 = 23368, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_2 = 23369, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_3 = 23370, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_0 = 23371, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_1 = 23372, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_2 = 23373, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_3 = 23374, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_0 = 23375, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_1 = 23376, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_2 = 23377, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_3 = 23378, + SPR_MINIATURE_RAILWAY_25_DEG_UP_SW_NE = 23379, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_SW_NE = 23380, + SPR_MINIATURE_RAILWAY_25_DEG_UP_NE_SW = 23381, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_NE_SW = 23382, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_NE_SW = 23383, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_SW_NE = 23384, + SPR_MINIATURE_RAILWAY_25_DEG_UP_NW_SE = 23385, + SPR_MINIATURE_RAILWAY_25_DEG_UP_SE_NW = 23386, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_NW_SE = 23387, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_SE_NW = 23388, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_SE_NW = 23389, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_NW_SE = 23390, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_0 = 23391, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_1 = 23392, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_2 = 23393, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_0 = 23394, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_1 = 23395, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_2 = 23396, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_0 = 23397, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_1 = 23398, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_2 = 23399, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_0 = 23400, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_1 = 23401, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_2 = 23402, + SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_SW_NE = 23403, + SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_NW_SE = 23404, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_0 = 23405, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_1 = 23406, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_2 = 23407, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_3 = 23408, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_0 = 23409, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_1 = 23410, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_2 = 23411, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_3 = 23412, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_0 = 23413, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_1 = 23414, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_2 = 23415, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_3 = 23416, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_0 = 23417, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_1 = 23418, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_2 = 23419, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_3 = 23420, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_0 = 23421, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_1 = 23422, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_2 = 23423, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_3 = 23424, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_0 = 23425, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_1 = 23426, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_2 = 23427, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_3 = 23428, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_0 = 23429, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_1 = 23430, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_2 = 23431, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_3 = 23432, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_0 = 23433, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_1 = 23434, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_2 = 23435, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_3 = 23436, SPR_MINIATURE_RAILWAY_DIAG_FLAT_W_E = 23437, SPR_MINIATURE_RAILWAY_DIAG_FLAT_N_S = 23438, SPR_MINIATURE_RAILWAY_DIAG_FLAT_E_W = 23439, @@ -140,167 +140,167 @@ enum SPR_MINIATURE_RAILWAY_DIAG_25_DEG_UP_S_N = 23452, }; -static const uint32 minature_railway_track_floor[4] = { +static const uint32 miniature_railway_track_floor[4] = { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_90_DEG }; -static const uint32 minature_railway_track_pieces_flat[4] = { - SPR_MINATURE_RAILWAY_FLAT_SW_NE, - SPR_MINATURE_RAILWAY_FLAT_NW_SE, - SPR_MINATURE_RAILWAY_FLAT_SW_NE, - SPR_MINATURE_RAILWAY_FLAT_NW_SE, +static const uint32 miniature_railway_track_pieces_flat[4] = { + SPR_MINIATURE_RAILWAY_FLAT_SW_NE, + SPR_MINIATURE_RAILWAY_FLAT_NW_SE, + SPR_MINIATURE_RAILWAY_FLAT_SW_NE, + SPR_MINIATURE_RAILWAY_FLAT_NW_SE, }; -static const uint32 minature_railway_station_floor[4] = { +static const uint32 miniature_railway_station_floor[4] = { SPR_STATION_BASE_A_SW_NE, SPR_STATION_BASE_A_NW_SE, SPR_STATION_BASE_A_SW_NE, SPR_STATION_BASE_A_NW_SE }; -static const uint32 minature_railway_track_pieces_flat_station[4] = { - SPR_MINATURE_RAILWAY_FLAT_NO_BASE_SW_NE, - SPR_MINATURE_RAILWAY_FLAT_NO_BASE_NW_SE, - SPR_MINATURE_RAILWAY_FLAT_NO_BASE_SW_NE, - SPR_MINATURE_RAILWAY_FLAT_NO_BASE_NW_SE, +static const uint32 miniature_railway_track_pieces_flat_station[4] = { + SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_SW_NE, + SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_NW_SE, + SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_SW_NE, + SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_NW_SE, }; -static const uint32 minature_railway_track_pieces_flat_quarter_turn_5_tiles[4][5] = { +static const uint32 miniature_railway_track_pieces_flat_quarter_turn_5_tiles[4][5] = { { - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_2, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_3, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_4, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_2, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_3, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SW_SE_PART_4, }, { - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_2, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_3, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_4, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_2, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_3, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NW_SW_PART_4, }, { - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_2, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_3, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_4, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_2, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_3, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_NE_NW_PART_4, }, { - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_2, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_3, - SPR_MINATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_4, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_2, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_3, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_5_TILES_SE_NE_PART_4, } }; -static const uint32 minature_railway_track_pieces_25_deg_up[4] = { - SPR_MINATURE_RAILWAY_25_DEG_UP_SW_NE, - SPR_MINATURE_RAILWAY_25_DEG_UP_NW_SE, - SPR_MINATURE_RAILWAY_25_DEG_UP_NE_SW, - SPR_MINATURE_RAILWAY_25_DEG_UP_SE_NW, +static const uint32 miniature_railway_track_pieces_25_deg_up[4] = { + SPR_MINIATURE_RAILWAY_25_DEG_UP_SW_NE, + SPR_MINIATURE_RAILWAY_25_DEG_UP_NW_SE, + SPR_MINIATURE_RAILWAY_25_DEG_UP_NE_SW, + SPR_MINIATURE_RAILWAY_25_DEG_UP_SE_NW, }; -static const uint32 minature_railway_track_pieces_flat_to_25_deg_up[4] = { - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_SW_NE, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_NW_SE, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_NE_SW, - SPR_MINATURE_RAILWAY_FLAT_TO_25_DEG_UP_SE_NW, +static const uint32 miniature_railway_track_pieces_flat_to_25_deg_up[4] = { + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_SW_NE, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_NW_SE, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_NE_SW, + SPR_MINIATURE_RAILWAY_FLAT_TO_25_DEG_UP_SE_NW, }; -static const uint32 minature_railway_track_pieces_25_deg_up_to_flat[4] = { - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_SW_NE, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_NW_SE, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_NE_SW, - SPR_MINATURE_RAILWAY_25_DEG_UP_TO_FLAT_SE_NW, +static const uint32 miniature_railway_track_pieces_25_deg_up_to_flat[4] = { + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_SW_NE, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_NW_SE, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_NE_SW, + SPR_MINIATURE_RAILWAY_25_DEG_UP_TO_FLAT_SE_NW, }; -static const uint32 minature_railway_track_pieces_s_bend_left[2][4] = { +static const uint32 miniature_railway_track_pieces_s_bend_left[2][4] = { { - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_0, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_1, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_2, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_3, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_0, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_1, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_2, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SW_NE_PART_3, }, { - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_3, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_2, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_1, - SPR_MINATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_0, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_3, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_2, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_1, + SPR_MINIATURE_RAILWAY_S_BEND_LEFT_SE_NW_PART_0, } }; -static const uint32 minature_railway_track_pieces_s_bend_right[2][4] = { +static const uint32 miniature_railway_track_pieces_s_bend_right[2][4] = { { - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_0, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_1, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_2, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_3, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_0, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_1, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_2, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SW_NE_PART_3, }, { - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_3, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_2, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_1, - SPR_MINATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_0, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_3, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_2, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_1, + SPR_MINIATURE_RAILWAY_S_BEND_RIGHT_SE_NW_PART_0, } }; -static const uint32 minature_railway_track_pieces_flat_quarter_turn_3_tiles[4][3] = { +static const uint32 miniature_railway_track_pieces_flat_quarter_turn_3_tiles[4][3] = { { - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_2 + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_2 }, { - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_2 + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_2 }, { - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_2 + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_2 }, { - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_0, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_1, - SPR_MINATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_2 + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_0, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_1, + SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_2 } }; -static const uint32 minature_railway_track_pieces_right_eight_to_diag[4][4] = { +static const uint32 miniature_railway_track_pieces_right_eight_to_diag[4][4] = { { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_E_PART_3, }, { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_S_PART_3, }, { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_W_PART_3, }, { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_N_PART_3, }, }; -static const rct_xyz16 minature_railway_track_pieces_right_eight_to_diag_bounds[4][4] = { +static const rct_xyz16 miniature_railway_track_pieces_right_eight_to_diag_bounds[4][4] = { { {32, 32, 2}, {32, 16, 2}, @@ -327,7 +327,7 @@ static const rct_xyz16 minature_railway_track_pieces_right_eight_to_diag_bounds[ }, }; -static const rct_xy16 minature_railway_track_pieces_right_eight_to_diag_offset[4][4] = { +static const rct_xy16 miniature_railway_track_pieces_right_eight_to_diag_offset[4][4] = { { {0, 0}, {0, 16}, @@ -354,34 +354,34 @@ static const rct_xy16 minature_railway_track_pieces_right_eight_to_diag_offset[4 }, }; -static const uint32 minature_railway_track_pieces_left_eight_to_diag[4][4] = { +static const uint32 miniature_railway_track_pieces_left_eight_to_diag[4][4] = { { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SW_N_PART_3, }, { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NW_E_PART_3, }, { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_NE_S_PART_3, }, { - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_0, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_1, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_2, - SPR_MINATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_3, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_0, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_1, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_2, + SPR_MINIATURE_RAILWAY_EIGHT_TO_DIAG_SE_W_PART_3, }, }; -static const rct_xyz16 minature_railway_track_pieces_left_eight_to_diag_bounds[4][4] = { +static const rct_xyz16 miniature_railway_track_pieces_left_eight_to_diag_bounds[4][4] = { { {32, 32, 2}, {32, 16, 2}, @@ -408,7 +408,7 @@ static const rct_xyz16 minature_railway_track_pieces_left_eight_to_diag_bounds[4 }, }; -static const rct_xy16 minature_railway_track_pieces_left_eight_to_diag_offset[4][4] = { +static const rct_xy16 miniature_railway_track_pieces_left_eight_to_diag_offset[4][4] = { { {0, 0}, {0, 0}, @@ -435,7 +435,7 @@ static const rct_xy16 minature_railway_track_pieces_left_eight_to_diag_offset[4] }, }; -static const rct_xyz16 minature_railway_track_pieces_right_eight_to_orthog_bounds[4][4] = { +static const rct_xyz16 miniature_railway_track_pieces_right_eight_to_orthog_bounds[4][4] = { { {32, 32, 2}, {32, 16, 2}, @@ -462,7 +462,7 @@ static const rct_xyz16 minature_railway_track_pieces_right_eight_to_orthog_bound }, }; -static const rct_xy16 minature_railway_track_pieces_right_eight_to_orthog_offset[4][4] = { +static const rct_xy16 miniature_railway_track_pieces_right_eight_to_orthog_offset[4][4] = { { {0, 0}, {0, 0}, @@ -489,7 +489,7 @@ static const rct_xy16 minature_railway_track_pieces_right_eight_to_orthog_offset }, }; -static const rct_xyz16 minature_railway_track_pieces_left_eight_to_orthog_bounds[4][4] = { +static const rct_xyz16 miniature_railway_track_pieces_left_eight_to_orthog_bounds[4][4] = { { {32, 32, 2}, {32, 16, 2}, @@ -516,7 +516,7 @@ static const rct_xyz16 minature_railway_track_pieces_left_eight_to_orthog_bounds }, }; -static const rct_xy16 minature_railway_track_pieces_left_eight_to_orthog_offset[4][4] = { +static const rct_xy16 miniature_railway_track_pieces_left_eight_to_orthog_offset[4][4] = { { {0, 0}, {0, 16}, @@ -572,21 +572,21 @@ static const uint32 miniature_railway_track_pieces_diag_25_deg_up[4] = { }; /** rct2: 0x008AD0C0 */ -static void paint_minature_railway_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { bool isSupported = wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); uint32 imageId; if (isSupported) { - imageId = minature_railway_track_floor[direction] | gTrackColours[SCHEME_SUPPORTS]; + imageId = miniature_railway_track_floor[direction] | gTrackColours[SCHEME_SUPPORTS]; sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); - imageId = minature_railway_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK]; + imageId = miniature_railway_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK]; sub_98199C_rotated(direction, imageId, 0, 6, 32, 20, 2, height, 0, 6, height); } else { - imageId = minature_railway_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK]; + imageId = miniature_railway_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 6, 32, 20, 2, height, 0, 6, height); } @@ -597,16 +597,16 @@ static void paint_minature_railway_track_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AD170, 0x008AD180, 0x008AD190 */ -static void paint_minature_railway_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { uint32 imageId; wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - imageId = minature_railway_station_floor[direction] | gTrackColours[SCHEME_MISC]; + imageId = miniature_railway_station_floor[direction] | gTrackColours[SCHEME_MISC]; sub_98197C_rotated(direction, imageId, 0, 0, 32, 28, 2, height - 2, 0, 2, height); - imageId = minature_railway_track_pieces_flat_station[direction] | gTrackColours[SCHEME_TRACK]; + imageId = miniature_railway_track_pieces_flat_station[direction] | gTrackColours[SCHEME_TRACK]; sub_98199C_rotated(direction, imageId, 0, 6, 32, 20, 2, height, 0, 0, height); paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); @@ -618,10 +618,10 @@ static void paint_minature_railway_station(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008AD0D0 */ -static void paint_minature_railway_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - uint32 imageId = minature_railway_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; + uint32 imageId = miniature_railway_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height); @@ -639,10 +639,10 @@ static void paint_minature_railway_track_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AD0E0 */ -static void paint_minature_railway_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - uint32 imageId = minature_railway_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; + uint32 imageId = miniature_railway_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height); @@ -660,10 +660,10 @@ static void paint_minature_railway_track_flat_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008AD0F0 */ -static void paint_minature_railway_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - uint32 imageId = minature_railway_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK]; + uint32 imageId = miniature_railway_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height); @@ -681,24 +681,24 @@ static void paint_minature_railway_track_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x008AD100 */ -static void paint_minature_railway_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - paint_minature_railway_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); + paint_miniature_railway_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD110 */ -static void paint_minature_railway_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - paint_minature_railway_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); + paint_miniature_railway_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD120 */ -static void paint_minature_railway_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - paint_minature_railway_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); + paint_miniature_railway_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } -const rct_xy16 minature_railway_right_quarter_turn_5_tiles_offsets[4][5] = { +const rct_xy16 miniature_railway_right_quarter_turn_5_tiles_offsets[4][5] = { { {0, 2}, {0, 16}, @@ -729,7 +729,7 @@ const rct_xy16 minature_railway_right_quarter_turn_5_tiles_offsets[4][5] = { } }; -const rct_xyz16 minature_railway_right_quarter_turn_5_tiles_bound_offsets[4][5] = { +const rct_xyz16 miniature_railway_right_quarter_turn_5_tiles_bound_offsets[4][5] = { { {0, 2, 0}, {0, 16, 0}, @@ -760,7 +760,7 @@ const rct_xyz16 minature_railway_right_quarter_turn_5_tiles_bound_offsets[4][5] } }; -const rct_xy16 minature_railway_right_quarter_turn_5_tiles_bound_lengths[4][5] = { +const rct_xy16 miniature_railway_right_quarter_turn_5_tiles_bound_lengths[4][5] = { { {32, 32}, {32, 16}, @@ -791,7 +791,7 @@ const rct_xy16 minature_railway_right_quarter_turn_5_tiles_bound_lengths[4][5] = } }; -static const uint32 minature_railway_right_quarter_turn_5_tiles_track_floor[4][5] = { +static const uint32 miniature_railway_right_quarter_turn_5_tiles_track_floor[4][5] = { { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_S_SEGMENT, @@ -832,22 +832,22 @@ static const sint8 right_quarter_turn_5_supports_type[4][7] = { static const sint8 right_quarter_turn_5_tiles_sprite_map[] = {0, -1, 1, 2, -1, 3, 4}; /** rct2: 0x008AD140 */ -static void paint_minature_railway_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1){ bool isSupported = wooden_a_supports_paint_setup(right_quarter_turn_5_supports_type[direction][trackSequence], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (isSupported == false || (trackSequence == 3 && direction == 2)) { - track_paint_util_right_quarter_turn_5_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], minature_railway_track_pieces_flat_quarter_turn_5_tiles, minature_railway_right_quarter_turn_5_tiles_offsets, minature_railway_right_quarter_turn_5_tiles_bound_lengths, NULL, get_current_rotation()); + track_paint_util_right_quarter_turn_5_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], miniature_railway_track_pieces_flat_quarter_turn_5_tiles, miniature_railway_right_quarter_turn_5_tiles_offsets, miniature_railway_right_quarter_turn_5_tiles_bound_lengths, NULL, get_current_rotation()); } else { - track_paint_util_right_quarter_turn_5_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_SUPPORTS], minature_railway_right_quarter_turn_5_tiles_track_floor, NULL, minature_railway_right_quarter_turn_5_tiles_bound_lengths, minature_railway_right_quarter_turn_5_tiles_bound_offsets, get_current_rotation()); + track_paint_util_right_quarter_turn_5_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_SUPPORTS], miniature_railway_right_quarter_turn_5_tiles_track_floor, NULL, miniature_railway_right_quarter_turn_5_tiles_bound_lengths, miniature_railway_right_quarter_turn_5_tiles_bound_offsets, get_current_rotation()); int index = right_quarter_turn_5_tiles_sprite_map[trackSequence]; - uint32 imageId = minature_railway_track_pieces_flat_quarter_turn_5_tiles[direction][index] | gTrackColours[SCHEME_TRACK]; - rct_xy16 offset = minature_railway_right_quarter_turn_5_tiles_offsets[direction][index]; - rct_xy16 boundsLength = minature_railway_right_quarter_turn_5_tiles_bound_lengths[direction][index]; + uint32 imageId = miniature_railway_track_pieces_flat_quarter_turn_5_tiles[direction][index] | gTrackColours[SCHEME_TRACK]; + rct_xy16 offset = miniature_railway_right_quarter_turn_5_tiles_offsets[direction][index]; + rct_xy16 boundsLength = miniature_railway_right_quarter_turn_5_tiles_bound_lengths[direction][index]; rct_xyz16 boundsOffset = { .x = offset.x, .y = offset.y, .z = 0 }; sub_98199C(imageId, (sint8) offset.x, (sint8) offset.y, boundsLength.x, boundsLength.y, 2, height, boundsOffset.x, boundsOffset.y, height + boundsOffset.z, get_current_rotation()); @@ -886,10 +886,10 @@ static void paint_minature_railway_track_right_quarter_turn_5_tiles(uint8 rideIn } /** rct2: 0x008AD130 */ -static void paint_minature_railway_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - paint_minature_railway_track_right_quarter_turn_5_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); + paint_miniature_railway_track_right_quarter_turn_5_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static const sint8 s_bend_left_supports_type[4][4] = { @@ -899,7 +899,7 @@ static const sint8 s_bend_left_supports_type[4][4] = { {1, 2, 4, 1} }; -static const uint32 minature_railway_s_bend_left_tiles_track_floor[2][4] = { +static const uint32 miniature_railway_s_bend_left_tiles_track_floor[2][4] = { { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_W_SEGMENT, @@ -915,7 +915,7 @@ static const uint32 minature_railway_s_bend_left_tiles_track_floor[2][4] = { }; /** rct2: 0x8AD150 */ -static void paint_minature_railway_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -937,7 +937,7 @@ static void paint_minature_railway_track_s_bend_left(uint8 rideIndex, uint8 trac {32, 27}, }; - uint32 imageId = minature_railway_track_pieces_s_bend_left[direction & 1][trackSequence] | gTrackColours[SCHEME_TRACK]; + uint32 imageId = miniature_railway_track_pieces_s_bend_left[direction & 1][trackSequence] | gTrackColours[SCHEME_TRACK]; rct_xy16 offset = offsetList[trackSequence]; rct_xy16 bounds = boundsList[trackSequence]; @@ -945,10 +945,10 @@ static void paint_minature_railway_track_s_bend_left(uint8 rideIndex, uint8 trac sub_98197C_rotated(direction, imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y, height); } else { - imageId = minature_railway_s_bend_left_tiles_track_floor[direction & 1][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; + imageId = miniature_railway_s_bend_left_tiles_track_floor[direction & 1][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; sub_98197C_rotated(direction, imageId, 0, 0, bounds.x, bounds.y, 2, height, offset.x, offset.y, height); - imageId = minature_railway_track_pieces_s_bend_left[direction & 1][trackSequence] | gTrackColours[SCHEME_TRACK]; + imageId = miniature_railway_track_pieces_s_bend_left[direction & 1][trackSequence] | gTrackColours[SCHEME_TRACK]; sub_98199C_rotated(direction, imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y, height); } if (direction == 0 || direction == 2) { @@ -980,7 +980,7 @@ static const sint8 s_bend_right_supports_type[4][4] = { {1, 5, 3, 1} }; -static const uint32 minature_railway_s_bend_right_tiles_track_floor[2][4] = { +static const uint32 miniature_railway_s_bend_right_tiles_track_floor[2][4] = { { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_S_SEGMENT, @@ -996,7 +996,7 @@ static const uint32 minature_railway_s_bend_right_tiles_track_floor[2][4] = { }; /** rct2: 0x008AD160 */ -static void paint_minature_railway_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -1018,17 +1018,17 @@ static void paint_minature_railway_track_s_bend_right(uint8 rideIndex, uint8 tra {32, 27}, }; - uint32 imageId = minature_railway_track_pieces_s_bend_right[direction&1][trackSequence] | gTrackColours[SCHEME_TRACK]; + uint32 imageId = miniature_railway_track_pieces_s_bend_right[direction&1][trackSequence] | gTrackColours[SCHEME_TRACK]; rct_xy16 offset = offsetList[trackSequence]; rct_xy16 bounds = boundsList[trackSequence]; if (isSupported == false) { sub_98197C_rotated(direction, imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y, height); } else { - imageId = minature_railway_s_bend_right_tiles_track_floor[direction & 1][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; + imageId = miniature_railway_s_bend_right_tiles_track_floor[direction & 1][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; sub_98197C_rotated(direction, imageId, 0, 0, bounds.x, bounds.y, 2, height, offset.x, offset.y, height); - imageId = minature_railway_track_pieces_s_bend_right[direction & 1][trackSequence] | gTrackColours[SCHEME_TRACK]; + imageId = miniature_railway_track_pieces_s_bend_right[direction & 1][trackSequence] | gTrackColours[SCHEME_TRACK]; sub_98199C_rotated(direction, imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y, height); } @@ -1054,7 +1054,7 @@ static void paint_minature_railway_track_s_bend_right(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 32, 0x20); } -static const uint32 minature_railway_right_quarter_turn_3_tile_track_floor[4][3] = { +static const uint32 miniature_railway_right_quarter_turn_3_tile_track_floor[4][3] = { { SPR_FLOOR_PLANKS_S_SEGMENT, 0, @@ -1077,7 +1077,7 @@ static const uint32 minature_railway_right_quarter_turn_3_tile_track_floor[4][3] } }; -const rct_xyz16 minature_railway_right_quarter_turn_3_tile_bound_offsets[4][3] = { +const rct_xyz16 miniature_railway_right_quarter_turn_3_tile_bound_offsets[4][3] = { { {0, 6, 0}, {16, 16, 0}, @@ -1101,7 +1101,7 @@ const rct_xyz16 minature_railway_right_quarter_turn_3_tile_bound_offsets[4][3] = }; /** rct2: 0x008AD1B0 */ -static void paint_minature_railway_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { bool isSupported = false; if (trackSequence != 1 && trackSequence != 2) @@ -1110,16 +1110,16 @@ static void paint_minature_railway_track_right_quarter_turn_3_tiles(uint8 rideIn isSupported = wooden_a_supports_paint_setup(supportType[direction], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); } if (isSupported == false) { - track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], minature_railway_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); + track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], miniature_railway_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); } else { - track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_SUPPORTS], minature_railway_right_quarter_turn_3_tile_track_floor, NULL, defaultRightQuarterTurn3TilesBoundLengths, minature_railway_right_quarter_turn_3_tile_bound_offsets, get_current_rotation()); + track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_SUPPORTS], miniature_railway_right_quarter_turn_3_tile_track_floor, NULL, defaultRightQuarterTurn3TilesBoundLengths, miniature_railway_right_quarter_turn_3_tile_bound_offsets, get_current_rotation()); static const sint8 right_quarter_turn_3_tiles_sprite_map[] = {0, -1, 1, 2}; int index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; - uint32 imageId = minature_railway_track_pieces_flat_quarter_turn_3_tiles[direction][index] | gTrackColours[SCHEME_TRACK]; + uint32 imageId = miniature_railway_track_pieces_flat_quarter_turn_3_tiles[direction][index] | gTrackColours[SCHEME_TRACK]; rct_xy16 offset = defaultRightQuarterTurn3TilesOffsets[direction][index]; rct_xy16 boundsLength = defaultRightQuarterTurn3TilesBoundLengths[direction][index]; rct_xyz16 boundsOffset = { .x = offset.x, .y = offset.y, .z = 0 }; @@ -1140,14 +1140,14 @@ static void paint_minature_railway_track_right_quarter_turn_3_tiles(uint8 rideIn } /** rct2: 0x008AD1A0 */ -static void paint_minature_railway_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) {trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - paint_minature_railway_track_right_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); + paint_miniature_railway_track_right_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static const sint8 paint_minature_railway_eighth_to_diag_index[] = {0, 1, 2, -1, 3}; +static const sint8 paint_miniature_railway_eighth_to_diag_index[] = {0, 1, 2, -1, 3}; -static const uint32 minature_railway_floor_track_pieces_left_eight_to_diag[4][5] = { +static const uint32 miniature_railway_floor_track_pieces_left_eight_to_diag[4][5] = { { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS, @@ -1178,7 +1178,7 @@ static const uint32 minature_railway_floor_track_pieces_left_eight_to_diag[4][5] }, }; -static const rct_xyz16 minature_railway_track_floor_pieces_left_eight_to_diag_bounds[4][5] = { +static const rct_xyz16 miniature_railway_track_floor_pieces_left_eight_to_diag_bounds[4][5] = { { {32, 32, 2}, {32, 16, 2}, @@ -1209,7 +1209,7 @@ static const rct_xyz16 minature_railway_track_floor_pieces_left_eight_to_diag_bo }, }; -static const rct_xy16 minature_railway_track_floor_pieces_left_eight_to_diag_offset[4][5] = { +static const rct_xy16 miniature_railway_track_floor_pieces_left_eight_to_diag_offset[4][5] = { { {0, 0}, {0, 0}, @@ -1241,7 +1241,7 @@ static const rct_xy16 minature_railway_track_floor_pieces_left_eight_to_diag_off }; /** rct2: 0x008AD1C0 */ -static void paint_minature_railway_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { const uint8 supportType[4][5] = { { 0, 0, 3, 5, 1 }, @@ -1259,29 +1259,29 @@ static void paint_minature_railway_track_left_eighth_to_diag(uint8 rideIndex, ui } uint32 imageId; if (isSupported == false) { - sint8 index = paint_minature_railway_eighth_to_diag_index[trackSequence]; + sint8 index = paint_miniature_railway_eighth_to_diag_index[trackSequence]; if (index >= 0) { - imageId = minature_railway_track_pieces_left_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; - rct_xy16 offset = minature_railway_track_pieces_left_eight_to_diag_offset[direction][index]; - rct_xyz16 bounds = minature_railway_track_pieces_left_eight_to_diag_bounds[direction][index]; + imageId = miniature_railway_track_pieces_left_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; + rct_xy16 offset = miniature_railway_track_pieces_left_eight_to_diag_offset[direction][index]; + rct_xyz16 bounds = miniature_railway_track_pieces_left_eight_to_diag_bounds[direction][index]; if (isRightEighthToOrthog) { - bounds = minature_railway_track_pieces_right_eight_to_orthog_bounds[direction][index]; - offset = minature_railway_track_pieces_right_eight_to_orthog_offset[direction][index]; + bounds = miniature_railway_track_pieces_right_eight_to_orthog_bounds[direction][index]; + offset = miniature_railway_track_pieces_right_eight_to_orthog_offset[direction][index]; } sub_98197C(imageId, 0, 0, bounds.x, bounds.y, (sint8)bounds.z, height, offset.x, offset.y, height, get_current_rotation()); } } else { - imageId = minature_railway_floor_track_pieces_left_eight_to_diag[direction][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; - rct_xy16 offset = minature_railway_track_floor_pieces_left_eight_to_diag_offset[direction][trackSequence]; - rct_xyz16 bounds = minature_railway_track_floor_pieces_left_eight_to_diag_bounds[direction][trackSequence]; + imageId = miniature_railway_floor_track_pieces_left_eight_to_diag[direction][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; + rct_xy16 offset = miniature_railway_track_floor_pieces_left_eight_to_diag_offset[direction][trackSequence]; + rct_xyz16 bounds = miniature_railway_track_floor_pieces_left_eight_to_diag_bounds[direction][trackSequence]; sub_98197C(imageId, 0, 0, bounds.x, bounds.y, (sint8)bounds.z, height, offset.x, offset.y, height, get_current_rotation()); - sint8 index = paint_minature_railway_eighth_to_diag_index[trackSequence]; + sint8 index = paint_miniature_railway_eighth_to_diag_index[trackSequence]; if (index >= 0) { - imageId = minature_railway_track_pieces_left_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; - offset = minature_railway_track_pieces_left_eight_to_diag_offset[direction][index]; - bounds = minature_railway_track_pieces_left_eight_to_diag_bounds[direction][index]; + imageId = miniature_railway_track_pieces_left_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; + offset = miniature_railway_track_pieces_left_eight_to_diag_offset[direction][index]; + bounds = miniature_railway_track_pieces_left_eight_to_diag_bounds[direction][index]; sub_98199C(imageId, 0, 0, bounds.x, bounds.y, (sint8)bounds.z, height, offset.x, offset.y, height, get_current_rotation()); } } @@ -1297,7 +1297,7 @@ static void paint_minature_railway_track_left_eighth_to_diag(uint8 rideIndex, ui paint_util_set_general_support_height(height + 32, 0x20); } -static const uint32 minature_railway_floor_track_pieces_right_eight_to_diag[4][5] = { +static const uint32 miniature_railway_floor_track_pieces_right_eight_to_diag[4][5] = { { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS, @@ -1328,7 +1328,7 @@ static const uint32 minature_railway_floor_track_pieces_right_eight_to_diag[4][5 }, }; -static const rct_xyz16 minature_railway_track_floor_pieces_right_eight_to_diag_bounds[4][5] = { +static const rct_xyz16 miniature_railway_track_floor_pieces_right_eight_to_diag_bounds[4][5] = { { {32, 32, 2}, {32, 16, 2}, @@ -1359,7 +1359,7 @@ static const rct_xyz16 minature_railway_track_floor_pieces_right_eight_to_diag_b }, }; -static const rct_xy16 minature_railway_track_floor_pieces_right_eight_to_diag_offset[4][5] = { +static const rct_xy16 miniature_railway_track_floor_pieces_right_eight_to_diag_offset[4][5] = { { {0, 0}, {0, 16}, @@ -1391,7 +1391,7 @@ static const rct_xy16 minature_railway_track_floor_pieces_right_eight_to_diag_of }; /** rct2: 0x008AD1D0 */ -static void paint_minature_railway_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { const uint8 supportType[4][5] = { { 0, 0, 2, 4, 1 }, @@ -1410,29 +1410,29 @@ static void paint_minature_railway_track_right_eighth_to_diag(uint8 rideIndex, u uint32 imageId; if (isSupported == false) { - sint8 index = paint_minature_railway_eighth_to_diag_index[trackSequence]; + sint8 index = paint_miniature_railway_eighth_to_diag_index[trackSequence]; if (index >= 0) { - imageId = minature_railway_track_pieces_right_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; - rct_xy16 offset = minature_railway_track_pieces_right_eight_to_diag_offset[direction][index]; - rct_xyz16 bounds = minature_railway_track_pieces_right_eight_to_diag_bounds[direction][index]; + imageId = miniature_railway_track_pieces_right_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; + rct_xy16 offset = miniature_railway_track_pieces_right_eight_to_diag_offset[direction][index]; + rct_xyz16 bounds = miniature_railway_track_pieces_right_eight_to_diag_bounds[direction][index]; if (isLeftEighthToOrthog) { - bounds = minature_railway_track_pieces_left_eight_to_orthog_bounds[direction][index]; - offset = minature_railway_track_pieces_left_eight_to_orthog_offset[direction][index]; + bounds = miniature_railway_track_pieces_left_eight_to_orthog_bounds[direction][index]; + offset = miniature_railway_track_pieces_left_eight_to_orthog_offset[direction][index]; } sub_98197C(imageId, 0, 0, bounds.x, bounds.y, (sint8)bounds.z, height, offset.x, offset.y, height, get_current_rotation()); } } else { - imageId = minature_railway_floor_track_pieces_right_eight_to_diag[direction][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; - rct_xy16 offset = minature_railway_track_floor_pieces_right_eight_to_diag_offset[direction][trackSequence]; - rct_xyz16 bounds = minature_railway_track_floor_pieces_right_eight_to_diag_bounds[direction][trackSequence]; + imageId = miniature_railway_floor_track_pieces_right_eight_to_diag[direction][trackSequence] | gTrackColours[SCHEME_SUPPORTS]; + rct_xy16 offset = miniature_railway_track_floor_pieces_right_eight_to_diag_offset[direction][trackSequence]; + rct_xyz16 bounds = miniature_railway_track_floor_pieces_right_eight_to_diag_bounds[direction][trackSequence]; sub_98197C(imageId, 0, 0, bounds.x, bounds.y, (sint8)bounds.z, height, offset.x, offset.y, height, get_current_rotation()); - sint8 index = paint_minature_railway_eighth_to_diag_index[trackSequence]; + sint8 index = paint_miniature_railway_eighth_to_diag_index[trackSequence]; if (index >= 0) { - imageId = minature_railway_track_pieces_right_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; - offset = minature_railway_track_pieces_right_eight_to_diag_offset[direction][index]; - bounds = minature_railway_track_pieces_right_eight_to_diag_bounds[direction][index]; + imageId = miniature_railway_track_pieces_right_eight_to_diag[direction][index] | gTrackColours[SCHEME_TRACK]; + offset = miniature_railway_track_pieces_right_eight_to_diag_offset[direction][index]; + bounds = miniature_railway_track_pieces_right_eight_to_diag_bounds[direction][index]; sub_98199C(imageId, 0, 0, bounds.x, bounds.y, (sint8)bounds.z, height, offset.x, offset.y, height, get_current_rotation()); } } @@ -1449,17 +1449,17 @@ static void paint_minature_railway_track_right_eighth_to_diag(uint8 rideIndex, u } /** rct2: 0x008AD1E0 */ -static void paint_minature_railway_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - paint_minature_railway_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); + paint_miniature_railway_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD1F0 */ -static void paint_minature_railway_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - paint_minature_railway_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); + paint_miniature_railway_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } static const bool monorail_diag_image_segment[][4] = { @@ -1946,54 +1946,54 @@ static void miniature_railway_track_diag_25_deg_down_to_flat(uint8 rideIndex, ui /** * rct2: 0x008ACE48 */ -TRACK_PAINT_FUNCTION get_track_paint_function_minature_railway(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(int trackType, int direction) { switch (trackType) { case TRACK_ELEM_FLAT: - return paint_minature_railway_track_flat; + return paint_miniature_railway_track_flat; case TRACK_ELEM_END_STATION: case TRACK_ELEM_BEGIN_STATION: case TRACK_ELEM_MIDDLE_STATION: - return paint_minature_railway_station; + return paint_miniature_railway_station; case TRACK_ELEM_25_DEG_UP: - return paint_minature_railway_track_25_deg_up; + return paint_miniature_railway_track_25_deg_up; case TRACK_ELEM_FLAT_TO_25_DEG_UP: - return paint_minature_railway_track_flat_to_25_deg_up; + return paint_miniature_railway_track_flat_to_25_deg_up; case TRACK_ELEM_25_DEG_UP_TO_FLAT: - return paint_minature_railway_track_25_deg_up_to_flat; + return paint_miniature_railway_track_25_deg_up_to_flat; case TRACK_ELEM_25_DEG_DOWN: - return paint_minature_railway_track_25_deg_down; + return paint_miniature_railway_track_25_deg_down; case TRACK_ELEM_FLAT_TO_25_DEG_DOWN: - return paint_minature_railway_track_flat_to_25_deg_down; + return paint_miniature_railway_track_flat_to_25_deg_down; case TRACK_ELEM_25_DEG_DOWN_TO_FLAT: - return paint_minature_railway_track_25_deg_down_to_flat; + return paint_miniature_railway_track_25_deg_down_to_flat; case TRACK_ELEM_LEFT_QUARTER_TURN_5_TILES: - return paint_minature_railway_track_left_quarter_turn_5_tiles; + return paint_miniature_railway_track_left_quarter_turn_5_tiles; case TRACK_ELEM_RIGHT_QUARTER_TURN_5_TILES: - return paint_minature_railway_track_right_quarter_turn_5_tiles; + return paint_miniature_railway_track_right_quarter_turn_5_tiles; case TRACK_ELEM_S_BEND_LEFT: - return paint_minature_railway_track_s_bend_left; + return paint_miniature_railway_track_s_bend_left; case TRACK_ELEM_S_BEND_RIGHT: - return paint_minature_railway_track_s_bend_right; + return paint_miniature_railway_track_s_bend_right; case TRACK_ELEM_LEFT_QUARTER_TURN_3_TILES: - return paint_minature_railway_track_left_quarter_turn_3_tiles; + return paint_miniature_railway_track_left_quarter_turn_3_tiles; case TRACK_ELEM_RIGHT_QUARTER_TURN_3_TILES: - return paint_minature_railway_track_right_quarter_turn_3_tiles; + return paint_miniature_railway_track_right_quarter_turn_3_tiles; case TRACK_ELEM_LEFT_EIGHTH_TO_DIAG: - return paint_minature_railway_track_left_eighth_to_diag; + return paint_miniature_railway_track_left_eighth_to_diag; case TRACK_ELEM_RIGHT_EIGHTH_TO_DIAG: - return paint_minature_railway_track_right_eighth_to_diag; + return paint_miniature_railway_track_right_eighth_to_diag; case TRACK_ELEM_LEFT_EIGHTH_TO_ORTHOGONAL: - return paint_minature_railway_track_left_eighth_to_orthogonal; + return paint_miniature_railway_track_left_eighth_to_orthogonal; case TRACK_ELEM_RIGHT_EIGHTH_TO_ORTHOGONAL: - return paint_minature_railway_track_right_eighth_to_orthogonal; + return paint_miniature_railway_track_right_eighth_to_orthogonal; case TRACK_ELEM_DIAG_FLAT: return miniature_railway_track_diag_flat;