From 517b27c1a4e8070f366e9241b2e3c13e2fbfbeac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 9 Jan 2018 17:08:46 +0100 Subject: [PATCH] Format refactored files --- src/openrct2/ride/VehiclePaint.cpp | 1680 ++++++++++++++++++++-------- 1 file changed, 1192 insertions(+), 488 deletions(-) diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index 6ff1af4e73..ed1fa2e045 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -893,7 +893,8 @@ const vehicle_boundbox VehicleBoundboxes[16][224] = { // clang-format on // 6D5214 -static void vehicle_sprite_paint(paint_session * session, rct_vehicle *vehicle, sint32 ebx, sint32 ecx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint(paint_session * session, rct_vehicle * vehicle, sint32 ebx, sint32 ecx, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { sint32 baseImage_id = ebx; @@ -902,7 +903,7 @@ static void vehicle_sprite_paint(paint_session * session, rct_vehicle *vehicle, return; } vehicle_boundbox bb = VehicleBoundboxes[vehicleEntry->draw_order][ecx]; - if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_14) + if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_14) { baseImage_id += (vehicle->var_BA / 8) & 31; } @@ -911,26 +912,30 @@ static void vehicle_sprite_paint(paint_session * session, rct_vehicle *vehicle, baseImage_id += vehicle->var_C5; } uint32 rotation = get_current_rotation(); - sint32 image_id = baseImage_id | (vehicle->colours.body_colour << 19) | (vehicle->colours.trim_colour << 24) | IMAGE_TYPE_REMAP_2_PLUS; - paint_struct* ps = sub_98197C(session, image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, bb.offset_z + z, rotation); - if (ps != NULL) + sint32 image_id = + baseImage_id | (vehicle->colours.body_colour << 19) | (vehicle->colours.trim_colour << 24) | IMAGE_TYPE_REMAP_2_PLUS; + paint_struct * ps = sub_98197C(session, image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, + bb.offset_z + z, rotation); + if (ps != NULL) { ps->tertiary_colour = vehicle->colours_extended; } - rct_drawpixelinfo* dpi = session->Unk140E9A8; - if (dpi->zoom_level < 2 && vehicle->num_peeps > 0 && vehicleEntry->no_seating_rows > 0) + rct_drawpixelinfo * dpi = session->Unk140E9A8; + if (dpi->zoom_level < 2 && vehicle->num_peeps > 0 && vehicleEntry->no_seating_rows > 0) { baseImage_id += vehicleEntry->no_vehicle_images; for (sint32 i = 0; i < 8; i++) { if (vehicle->num_peeps > (i * 2) && vehicleEntry->no_seating_rows > i) { - image_id = baseImage_id | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[i * 2], vehicle->peep_tshirt_colours[(i * 2) + 1]); - if (i == 0 && vehicleEntry->flags & VEHICLE_ENTRY_FLAG_24) + image_id = baseImage_id | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[i * 2], + vehicle->peep_tshirt_colours[(i * 2) + 1]); + if (i == 0 && vehicleEntry->flags & VEHICLE_ENTRY_FLAG_24) { image_id += (vehicleEntry->no_vehicle_images * vehicle->var_C5); } - sub_98199C(session, image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, bb.offset_z + z, rotation); + sub_98199C(session, image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, + bb.offset_z + z, rotation); baseImage_id += vehicleEntry->no_vehicle_images; } } @@ -939,19 +944,23 @@ static void vehicle_sprite_paint(paint_session * session, rct_vehicle *vehicle, } // 6D520E -static void vehicle_sprite_paint_6D520E(paint_session * session, rct_vehicle *vehicle, sint32 ebx, sint32 ecx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint_6D520E(paint_session * session, rct_vehicle * vehicle, sint32 ebx, sint32 ecx, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicle_sprite_paint(session, vehicle, ebx + vehicle->swing_sprite, ecx, z, vehicleEntry); } // 6D51EB -static void vehicle_sprite_paint_6D51EB(paint_session * session, rct_vehicle *vehicle, sint32 ebx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint_6D51EB(paint_session * session, rct_vehicle * vehicle, sint32 ebx, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { sint32 ecx = ebx / 2; - if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) { + if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) + { ebx = ebx / 2; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15) + { ebx = ebx / 8; } ebx = (ebx * vehicleEntry->base_num_frames) + vehicle->swing_sprite + vehicleEntry->base_image_id; @@ -959,22 +968,26 @@ static void vehicle_sprite_paint_6D51EB(paint_session * session, rct_vehicle *ve } // 6D51DE -static void vehicle_sprite_paint_6D51DE(paint_session * session, rct_vehicle *vehicle, sint32 ebx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint_6D51DE(paint_session * session, rct_vehicle * vehicle, sint32 ebx, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->restraints_position < 64) { + if (vehicle->restraints_position < 64) + { vehicle_sprite_paint_6D51EB(session, vehicle, ebx, z, vehicleEntry); return; } - if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION)) { + if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION)) + { vehicle_sprite_paint_6D51EB(session, vehicle, ebx, z, vehicleEntry); return; } - if (ebx & 7) { + if (ebx & 7) + { vehicle_sprite_paint_6D51EB(session, vehicle, ebx, z, vehicleEntry); return; } sint32 ecx = ebx / 2; - ebx = ebx / 8; + ebx = ebx / 8; ebx += ((vehicle->restraints_position - 64) / 64) * 4; ebx *= vehicleEntry->base_num_frames; ebx += vehicleEntry->var_1C; @@ -982,491 +995,753 @@ static void vehicle_sprite_paint_6D51DE(paint_session * session, rct_vehicle *ve } // 6D51DE -static void vehicle_sprite_0_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } // 6D4EE7 -static void vehicle_sprite_0_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection / 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F34 -static void vehicle_sprite_0_2(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_2(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = (imageDirection / 2) + 108; sint32 ebx = ((imageDirection + 16) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F0C -static void vehicle_sprite_0_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F5C -static void vehicle_sprite_0_4(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_4(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 108; sint32 ebx = ((imageDirection + 48) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F84 -static void vehicle_sprite_0_5(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_5(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = (imageDirection / 8) + 124; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4FE4 -static void vehicle_sprite_0_6(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_6(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = (imageDirection / 8) + 128; sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D5055 -static void vehicle_sprite_0_7(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_7(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = (imageDirection / 8) + 132; sint32 ebx = (((imageDirection / 8) + 16) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D50C6 -static void vehicle_sprite_0_8(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_8(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = (imageDirection / 8) + 136; sint32 ebx = (((imageDirection / 8) + 24) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D5137 -static void vehicle_sprite_0_9(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_9(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = (imageDirection / 8) + 140; sint32 ebx = (((imageDirection / 8) + 32) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4FB1 -static void vehicle_sprite_0_10(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_10(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 124; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D501B -static void vehicle_sprite_0_11(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_11(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 128; sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D508C -static void vehicle_sprite_0_12(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_12(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 132; sint32 ebx = (((imageDirection / 8) + 20) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D50FD -static void vehicle_sprite_0_13(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_13(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 136; sint32 ebx = (((imageDirection / 8) + 28) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D516E -static void vehicle_sprite_0_14(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_14(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 140; sint32 ebx = (((imageDirection / 8) + 36) * vehicleEntry->base_num_frames) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4EE4 -static void vehicle_sprite_0_16(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_16(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection / 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F31 -static void vehicle_sprite_0_17(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_17(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = (imageDirection / 2) + 108; sint32 ebx = ((imageDirection + 16) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F09 -static void vehicle_sprite_0_18(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_18(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4F59 -static void vehicle_sprite_0_19(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_19(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 108; sint32 ebx = ((imageDirection + 48) * vehicleEntry->base_num_frames) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D51D7 -static void vehicle_sprite_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3DE4: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_0_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_0_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_0_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_0_4(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_0_5(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_0_6(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_0_7(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_0_8(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_0_9(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_0_10(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_0_11(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_0_12(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_0_13(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_0_14(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_0_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_0_16(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_0_17(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_0_18(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_0_19(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_0_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_0_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_0_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_0_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_0_4(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_0_5(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_0_6(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_0_7(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_0_8(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_0_9(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_0_10(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_0_11(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_0_12(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_0_13(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_0_14(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_0_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_0_16(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_0_17(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_0_18(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_0_19(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D4614 -static void vehicle_sprite_1_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4662 -static void vehicle_sprite_1_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (imageDirection * vehicleEntry->base_num_frames) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D46DB -static void vehicle_sprite_1_2(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_2(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_1_1(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D467D -static void vehicle_sprite_1_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection + 32) * vehicleEntry->base_num_frames) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D46FD -static void vehicle_sprite_1_4(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_4(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_1_3(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D460D -static void vehicle_sprite_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3C04: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_1_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_1_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_1_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_1_4(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_1_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_1_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_1_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_1_4(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_1_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_1_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_1_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_1_4(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_1_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_1_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_1_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_1_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_1_4(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D4791 -static void vehicle_sprite_2_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { - if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_14) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) + { + if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_14) + { sint32 ecx = (imageDirection / 2) + 16; sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { sint32 ecx = (imageDirection / 2) + 16; sint32 ebx = ((imageDirection + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); } - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4833 -static void vehicle_sprite_2_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = (imageDirection / 2) + 16; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D48D6 -static void vehicle_sprite_2_2(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_2(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) + { sint32 ecx = imageDirection / 2; - if (vehicleEntry->draw_order < 5) { + if (vehicleEntry->draw_order < 5) + { ecx += 108; sint32 ebx = (imageDirection * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { ecx += 16; sint32 ebx = (imageDirection * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); } - } else { + } + else + { vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4858 -static void vehicle_sprite_2_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = (imageDirection / 2) + 16; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4910 -static void vehicle_sprite_2_4(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_4(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) + { sint32 ecx = imageDirection / 2; - if (vehicleEntry->draw_order < 5) { - ecx = (ecx ^ 8) + 108; + if (vehicleEntry->draw_order < 5) + { + ecx = (ecx ^ 8) + 108; sint32 ebx = ((imageDirection + 32) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { ecx += 16; sint32 ebx = ((imageDirection + 32) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); } - } else { + } + else + { vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D476C -static void vehicle_sprite_2(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3CA4: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_2_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_2_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_2_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_2_4(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_2_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_2_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_2_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_2_4(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_2_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_2_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_2_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_2_4(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_2_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_2_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_2_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_2_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_2_4(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D49DC -static void vehicle_sprite_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) { + if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) + { vehicle_sprite_2(session, vehicle, imageDirection, z, vehicleEntry); - } else { + } + else + { sint32 ecx = (imageDirection / 4) + 32; sint32 ebx = ((imageDirection / 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); @@ -1474,11 +1749,15 @@ static void vehicle_sprite_3(paint_session * session, rct_vehicle *vehicle, sint } // 6D4A31 -static void vehicle_sprite_4(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_4(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) { + if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) + { vehicle_sprite_2(session, vehicle, imageDirection, z, vehicleEntry); - } else { + } + else + { sint32 ecx = (imageDirection / 2) + 40; sint32 ebx = ((imageDirection + 16) * vehicleEntry->base_num_frames) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); @@ -1486,672 +1765,1025 @@ static void vehicle_sprite_4(paint_session * session, rct_vehicle *vehicle, sint } // 6D463D -static void vehicle_sprite_5_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D469B -static void vehicle_sprite_5_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection + 64) * vehicleEntry->base_num_frames) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4722 -static void vehicle_sprite_5_2(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_2(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_5_1(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D46B9 -static void vehicle_sprite_5_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection + 96) * vehicleEntry->base_num_frames) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4747 -static void vehicle_sprite_5_4(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_4(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->base_num_frames) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_5_3(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4636 -static void vehicle_sprite_5(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3C54: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_5_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_5_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_5_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_5_4(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_5_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_5_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_5_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_5_4(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_5_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_5_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_5_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_5_4(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_5_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_5_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_5_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_5_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_5_4(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D47E4 -static void vehicle_sprite_6_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { - if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_14) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) + { + if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_14) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 16; sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->base_num_frames) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { sint32 ecx = ((imageDirection / 2) ^ 8) + 16; sint32 ebx = ((imageDirection + 40) * vehicleEntry->base_num_frames) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); } - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4880 -static void vehicle_sprite_6_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 16; sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4953 -static void vehicle_sprite_6_2(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_2(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) + { sint32 ecx = imageDirection / 2; - if (vehicleEntry->draw_order < 5) { + if (vehicleEntry->draw_order < 5) + { ecx += 108; sint32 ebx = ((imageDirection + 64) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { - ecx = (ecx ^ 8) + 16; + } + else + { + ecx = (ecx ^ 8) + 16; sint32 ebx = ((imageDirection + 64) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); } - } else { + } + else + { vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D48AB -static void vehicle_sprite_6_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 16; sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->base_num_frames) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4996 -static void vehicle_sprite_6_4(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_4(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) + { sint32 ecx = imageDirection / 2; - if (vehicleEntry->draw_order < 5) { - ecx = (ecx ^ 8) + 108; - sint32 ebx = ((imageDirection + 96) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; - vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { - ecx = (ecx ^ 8) + 16; + if (vehicleEntry->draw_order < 5) + { + ecx = (ecx ^ 8) + 108; sint32 ebx = ((imageDirection + 96) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); } - } else { + else + { + ecx = (ecx ^ 8) + 16; + sint32 ebx = ((imageDirection + 96) * vehicleEntry->base_num_frames) + vehicleEntry->var_44; + vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); + } + } + else + { vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D47DD -static void vehicle_sprite_6(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3CF4: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_6_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_6_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_6_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_6_4(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_6_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_6_2(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_6_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_6_4(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_6_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_6_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_6_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_6_4(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_6_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_6_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_6_2(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_6_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_6_4(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D4A05 -static void vehicle_sprite_7(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_7(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) + { sint32 ecx = ((imageDirection / 4) ^ 4) + 32; sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_6(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4A59 -static void vehicle_sprite_8(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_8(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 40; sint32 ebx = ((imageDirection + 48) * vehicleEntry->base_num_frames) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_6(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4A81 -static void vehicle_sprite_9(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_9(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 56; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4AE8 -static void vehicle_sprite_10(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_10(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 2) + 60; sint32 ebx = ((imageDirection + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4B57 -static void vehicle_sprite_11(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_11(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 76; sint32 ebx = (((imageDirection / 8) + 72) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4BB7 -static void vehicle_sprite_12(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_12(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 80; sint32 ebx = (((imageDirection / 8) + 80) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4C17 -static void vehicle_sprite_13(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_13(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 84; sint32 ebx = (((imageDirection / 8) + 88) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4C77 -static void vehicle_sprite_14(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_14(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 88; sint32 ebx = (((imageDirection / 8) + 96) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4CD7 -static void vehicle_sprite_15(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_15(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 92; sint32 ebx = (((imageDirection / 8) + 104) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4D37 -static void vehicle_sprite_16(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_16(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 96; sint32 ebx = (((imageDirection / 8) + 112) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_4(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4AA3 -static void vehicle_sprite_17(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_17(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { - if( (vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN_TO_60_DEG_DOWN && - (vehicle->track_type >> 2) != TRACK_ELEM_60_DEG_DOWN_TO_90_DEG_DOWN) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { + if ((vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN_TO_60_DEG_DOWN && + (vehicle->track_type >> 2) != TRACK_ELEM_60_DEG_DOWN_TO_90_DEG_DOWN) + { vehicleEntry--; } } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 56; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4B0D -static void vehicle_sprite_18(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_18(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { - if( (vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN && + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { + if ((vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN && (vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN_TO_60_DEG_DOWN && - (vehicle->track_type >> 2) != TRACK_ELEM_60_DEG_DOWN_TO_90_DEG_DOWN) { + (vehicle->track_type >> 2) != TRACK_ELEM_60_DEG_DOWN_TO_90_DEG_DOWN) + { vehicleEntry--; } } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 60; sint32 ebx = ((imageDirection + 40) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4B80 -static void vehicle_sprite_19(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_19(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 76; sint32 ebx = (((imageDirection / 8) + 76) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4BE0 -static void vehicle_sprite_20(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_20(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 80; sint32 ebx = (((imageDirection / 8) + 84) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4C40 -static void vehicle_sprite_21(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_21(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 84; sint32 ebx = (((imageDirection / 8) + 92) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4CA0 -static void vehicle_sprite_22(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_22(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 88; sint32 ebx = (((imageDirection / 8) + 100) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4D00 -static void vehicle_sprite_23(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_23(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 92; sint32 ebx = (((imageDirection / 8) + 108) * vehicleEntry->base_num_frames) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_8(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D51A5 -static void vehicle_sprite_24(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_24(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry--; } - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_CORKSCREWS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_CORKSCREWS) + { sint32 eax = ((vehicle->vehicle_sprite_type - 24) * 4); sint32 ecx = (imageDirection / 8) + eax + 144; sint32 ebx = (((imageDirection / 8) + eax) * vehicleEntry->base_num_frames) + vehicleEntry->var_4C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4D67 -static void vehicle_sprite_50_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4DB5 -static void vehicle_sprite_50_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = ((imageDirection / 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4DD3 -static void vehicle_sprite_50_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4D60 -static void vehicle_sprite_50(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3D44: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_50_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_50_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_50_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_50_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_50_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_50_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_50_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_50_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_50_0(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D4E3A -static void vehicle_sprite_51(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_51(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 100; sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4E8F -static void vehicle_sprite_52(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_52(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) + { sint32 ecx = (imageDirection / 8) + 104; sint32 ebx = (((imageDirection / 8) + 16) * vehicleEntry->base_num_frames) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4D90 -static void vehicle_sprite_53_0(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53_0(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->base_num_frames) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4DF4 -static void vehicle_sprite_53_1(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53_1(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4E15 -static void vehicle_sprite_53_3(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53_3(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) + { sint32 ecx = imageDirection / 2; sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->base_num_frames) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4D89 -static void vehicle_sprite_53(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { // 0x009A3D94: - switch (vehicle->bank_rotation) { - case 0: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 1: vehicle_sprite_53_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 2: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 3: vehicle_sprite_53_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 4: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 5: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 6: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 7: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 8: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 9: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 10: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 11: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 12: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 13: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 14: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 15: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 16: vehicle_sprite_53_1(session, vehicle, imageDirection, z, vehicleEntry); break; - case 17: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; - case 18: vehicle_sprite_53_3(session, vehicle, imageDirection, z, vehicleEntry); break; - case 19: vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); break; + switch (vehicle->bank_rotation) + { + case 0: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 1: + vehicle_sprite_53_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 2: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 3: + vehicle_sprite_53_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 4: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 5: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 6: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 7: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 8: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 9: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 10: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 11: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 12: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 13: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 14: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 15: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 16: + vehicle_sprite_53_1(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 17: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 18: + vehicle_sprite_53_3(session, vehicle, imageDirection, z, vehicleEntry); + break; + case 19: + vehicle_sprite_53_0(session, vehicle, imageDirection, z, vehicleEntry); + break; } } // 6D4E63 -static void vehicle_sprite_54(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_54(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 100; sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->base_num_frames) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4EB8 -static void vehicle_sprite_55(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_55(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) + { sint32 ecx = ((imageDirection / 8) ^ 2) + 104; sint32 ebx = (((imageDirection / 8) + 20) * vehicleEntry->base_num_frames) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_0(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D47DA -static void vehicle_sprite_56(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_56(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; vehicle_sprite_6(session, vehicle, imageDirection, z, vehicleEntry); } // 6D4A02 -static void vehicle_sprite_57(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_57(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) + { sint32 ecx = ((imageDirection / 4) ^ 4) + 32; sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->base_num_frames) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_6(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4A56 -static void vehicle_sprite_58(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_58(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { vehicleEntry--; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) + { sint32 ecx = ((imageDirection / 2) ^ 8) + 40; sint32 ebx = ((imageDirection + 48) * vehicleEntry->base_num_frames) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_6(session, vehicle, imageDirection, z, vehicleEntry); } } // 6D4773 -static void vehicle_sprite_59(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_59(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_14) { + if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_14) + { sint32 ecx = (imageDirection / 2) + 16; sint32 ebx = (imageDirection * vehicleEntry->base_num_frames) + vehicleEntry->var_4C; vehicle_sprite_paint_6D520E(session, vehicle, ebx, ecx, z, vehicleEntry); - } else { + } + else + { vehicle_sprite_2(session, vehicle, imageDirection, z, vehicleEntry); } } // 0x009A3B14: -typedef void (*vehicle_sprite_func)(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry); +typedef void (*vehicle_sprite_func)(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection, sint32 z, + const rct_ride_entry_vehicle * vehicleEntry); // clang-format off static const vehicle_sprite_func vehicle_sprite_funcs[] = { vehicle_sprite_0, @@ -2221,21 +2853,27 @@ static const vehicle_sprite_func vehicle_sprite_funcs[] = { * * rct2: 0x006D5600 */ -static void vehicle_visual_splash1_effect(paint_session * session, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash1_effect(paint_session * session, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - if ((vehicle->track_type >> 2) != TRACK_ELEM_WATER_SPLASH) { + if ((vehicle->track_type >> 2) != TRACK_ELEM_WATER_SPLASH) + { return; } - if (vehicle->track_progress < 48) { + if (vehicle->track_progress < 48) + { return; } - if (vehicle->track_progress >= 112) { + if (vehicle->track_progress >= 112) + { return; } - if (vehicle_get_head(vehicle)->velocity <= 0x50000) { + if (vehicle_get_head(vehicle)->velocity <= 0x50000) + { return; } - sint32 image_id = 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = + 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(session, image_id, 0, 0, 0, 0, 0, z, 0, 0, z, get_current_rotation()); } @@ -2243,18 +2881,23 @@ static void vehicle_visual_splash1_effect(paint_session * session, sint32 z, rct * * rct2: 0x006D5696 */ -static void vehicle_visual_splash2_effect(paint_session * session, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash2_effect(paint_session * session, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->sprite_direction & 7) { + if (vehicle->sprite_direction & 7) + { return; } - if (vehicle->vehicle_sprite_type != 0) { + if (vehicle->vehicle_sprite_type != 0) + { return; } - if (vehicle->velocity <= 0x50000) { + if (vehicle->velocity <= 0x50000) + { return; } - sint32 image_id = 29046 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = + 29046 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(session, image_id, 0, 0, 0, 0, 0, z, 0, 0, z, get_current_rotation()); } @@ -2262,18 +2905,23 @@ static void vehicle_visual_splash2_effect(paint_session * session, sint32 z, rct * * rct2: 0x006D57EE */ -static void vehicle_visual_splash3_effect(paint_session * session, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash3_effect(paint_session * session, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->sprite_direction & 7) { + if (vehicle->sprite_direction & 7) + { return; } - if (vehicle->vehicle_sprite_type != 0) { + if (vehicle->vehicle_sprite_type != 0) + { return; } - if (vehicle->velocity <= 0x50000) { + if (vehicle->velocity <= 0x50000) + { return; } - sint32 image_id = 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = + 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(session, image_id, 0, 0, 0, 0, 0, z, 0, 0, z, get_current_rotation()); } @@ -2281,19 +2929,24 @@ static void vehicle_visual_splash3_effect(paint_session * session, sint32 z, rct * * rct2: 0x006D5783 */ -static void vehicle_visual_splash4_effect(paint_session * session, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash4_effect(paint_session * session, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - rct_vehicle *vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); - if (vehicle2->velocity <= 0x50000) { + rct_vehicle * vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + if (vehicle2->velocity <= 0x50000) + { return; } - if (vehicle->sprite_direction & 7) { + if (vehicle->sprite_direction & 7) + { return; } - if (vehicle->vehicle_sprite_type != 0) { + if (vehicle->vehicle_sprite_type != 0) + { return; } - sint32 image_id = 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = + 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(session, image_id, 0, 0, 1, 1, 0, z, 0, 0, z, get_current_rotation()); } @@ -2301,35 +2954,56 @@ static void vehicle_visual_splash4_effect(paint_session * session, sint32 z, rct * * rct2: 0x006D5701 */ -static void vehicle_visual_splash5_effect(paint_session * session, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash5_effect(paint_session * session, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - rct_vehicle *vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); - if (vehicle2->velocity <= 0x50000) { + rct_vehicle * vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + if (vehicle2->velocity <= 0x50000) + { return; } - if (vehicle->sprite_direction & 7) { + if (vehicle->sprite_direction & 7) + { return; } - if (vehicle->vehicle_sprite_type != 0) { + if (vehicle->vehicle_sprite_type != 0) + { return; } - if (!track_element_is_covered(vehicle->track_type >> 2)) { + if (!track_element_is_covered(vehicle->track_type >> 2)) + { return; } - sint32 image_id = 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = + 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(session, image_id, 0, 0, 1, 1, 0, z, 0, 0, z, get_current_rotation()); } -void vehicle_visual_splash_effect(paint_session * session, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_splash_effect(paint_session * session, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - switch (vehicleEntry->effect_visual) { - case 1: /* nullsub */ break; - case VEHICLE_VISUAL_SPLASH1_EFFECT: vehicle_visual_splash1_effect(session, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_SPLASH2_EFFECT: vehicle_visual_splash2_effect(session, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_SPLASH3_EFFECT: vehicle_visual_splash3_effect(session, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_SPLASH4_EFFECT: vehicle_visual_splash4_effect(session, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_SPLASH5_EFFECT: vehicle_visual_splash5_effect(session, z, vehicle, vehicleEntry); break; - default: assert(false); break; + switch (vehicleEntry->effect_visual) + { + case 1: /* nullsub */ + break; + case VEHICLE_VISUAL_SPLASH1_EFFECT: + vehicle_visual_splash1_effect(session, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_SPLASH2_EFFECT: + vehicle_visual_splash2_effect(session, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_SPLASH3_EFFECT: + vehicle_visual_splash3_effect(session, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_SPLASH4_EFFECT: + vehicle_visual_splash4_effect(session, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_SPLASH5_EFFECT: + vehicle_visual_splash5_effect(session, z, vehicle, vehicleEntry); + break; + default: + assert(false); + break; } } @@ -2337,9 +3011,11 @@ void vehicle_visual_splash_effect(paint_session * session, sint32 z, rct_vehicle * * rct2: 0x006D45F8 */ -void vehicle_visual_default(paint_session * session, sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_default(paint_session * session, sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle * vehicle, + const rct_ride_entry_vehicle * vehicleEntry) { - if (vehicle->vehicle_sprite_type < Util::CountOf(vehicle_sprite_funcs)) { + if (vehicle->vehicle_sprite_type < Util::CountOf(vehicle_sprite_funcs)) + { vehicle_sprite_funcs[vehicle->vehicle_sprite_type](session, vehicle, imageDirection, z, vehicleEntry); } } @@ -2348,24 +3024,28 @@ void vehicle_visual_default(paint_session * session, sint32 x, sint32 imageDirec * * rct2: 0x006D4244 */ -void vehicle_paint(paint_session * session, rct_vehicle *vehicle, sint32 imageDirection) +void vehicle_paint(paint_session * session, rct_vehicle * vehicle, sint32 imageDirection) { - rct_ride_entry *rideEntry = 0; - const rct_ride_entry_vehicle *vehicleEntry; + rct_ride_entry * rideEntry = 0; + const rct_ride_entry_vehicle * vehicleEntry; sint32 x = vehicle->x; sint32 y = vehicle->y; sint32 z = vehicle->z; - if (vehicle->flags & SPRITE_FLAGS_IS_CRASHED_VEHICLE_SPRITE) { + if (vehicle->flags & SPRITE_FLAGS_IS_CRASHED_VEHICLE_SPRITE) + { uint32 ebx = 22965 + vehicle->var_C5; sub_98197C(session, ebx, 0, 0, 1, 1, 0, z, 0, 0, z + 2, get_current_rotation()); return; } - if (vehicle->ride_subtype == RIDE_ENTRY_INDEX_NULL) { + if (vehicle->ride_subtype == RIDE_ENTRY_INDEX_NULL) + { vehicleEntry = &CableLiftVehicle; - } else { + } + else + { rideEntry = get_ride_entry(vehicle->ride_subtype); if (rideEntry == NULL) { @@ -2373,23 +3053,47 @@ void vehicle_paint(paint_session * session, rct_vehicle *vehicle, sint32 imageDi } vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; - if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) { + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) + { vehicleEntry++; z += 16; } } - switch (vehicleEntry->car_visual) { - case VEHICLE_VISUAL_DEFAULT: vehicle_visual_default(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_LAUNCHED_FREEFALL: vehicle_visual_launched_freefall(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_OBSERVATION_TOWER: vehicle_visual_observation_tower(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_RIVER_RAPIDS: vehicle_visual_river_rapids(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_MINI_GOLF_PLAYER: vehicle_visual_mini_golf_player(session, x, imageDirection, y, z, vehicle); break; - case VEHICLE_VISUAL_MINI_GOLF_BALL: vehicle_visual_mini_golf_ball(session, x, imageDirection, y, z, vehicle); break; - case VEHICLE_VISUAL_REVERSER: vehicle_visual_reverser(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_SPLASH_BOATS_OR_WATER_COASTER: vehicle_visual_splash_boats_or_water_coaster(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_ROTO_DROP: vehicle_visual_roto_drop(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_VIRGINIA_REEL: vehicle_visual_virginia_reel(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; - case VEHICLE_VISUAL_SUBMARINE: vehicle_visual_submarine(session, x, imageDirection, y, z, vehicle, vehicleEntry); break; + switch (vehicleEntry->car_visual) + { + case VEHICLE_VISUAL_DEFAULT: + vehicle_visual_default(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_LAUNCHED_FREEFALL: + vehicle_visual_launched_freefall(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_OBSERVATION_TOWER: + vehicle_visual_observation_tower(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_RIVER_RAPIDS: + vehicle_visual_river_rapids(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_MINI_GOLF_PLAYER: + vehicle_visual_mini_golf_player(session, x, imageDirection, y, z, vehicle); + break; + case VEHICLE_VISUAL_MINI_GOLF_BALL: + vehicle_visual_mini_golf_ball(session, x, imageDirection, y, z, vehicle); + break; + case VEHICLE_VISUAL_REVERSER: + vehicle_visual_reverser(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_SPLASH_BOATS_OR_WATER_COASTER: + vehicle_visual_splash_boats_or_water_coaster(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_ROTO_DROP: + vehicle_visual_roto_drop(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_VIRGINIA_REEL: + vehicle_visual_virginia_reel(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; + case VEHICLE_VISUAL_SUBMARINE: + vehicle_visual_submarine(session, x, imageDirection, y, z, vehicle, vehicleEntry); + break; } }