From a5ef8d624054b9a62b6b1335e81bda668db829d9 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 19 Jan 2020 15:53:17 +0000 Subject: [PATCH] Rename rct_vehicle --- src/openrct2-ui/WindowManager.cpp | 4 +- .../interface/ViewportInteraction.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 12 +- src/openrct2-ui/windows/Window.h | 4 +- src/openrct2/GameStateSnapshots.cpp | 124 +++--- src/openrct2/drawing/LightFX.cpp | 6 +- src/openrct2/interface/InteractiveConsole.cpp | 2 +- src/openrct2/interface/Viewport.h | 4 +- src/openrct2/management/NewsItem.cpp | 2 +- src/openrct2/paint/sprite/Paint.Sprite.cpp | 2 +- src/openrct2/peep/Guest.cpp | 28 +- src/openrct2/peep/Staff.cpp | 6 +- src/openrct2/rct1/S4Importer.cpp | 14 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Exporter.h | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/CableLift.cpp | 46 +-- src/openrct2/ride/CableLift.h | 6 +- src/openrct2/ride/Ride.cpp | 40 +- src/openrct2/ride/Ride.h | 2 +- src/openrct2/ride/Station.cpp | 10 +- src/openrct2/ride/Track.cpp | 2 +- src/openrct2/ride/Track.h | 2 +- src/openrct2/ride/Vehicle.cpp | 376 +++++++++--------- src/openrct2/ride/Vehicle.h | 44 +- src/openrct2/ride/VehiclePaint.cpp | 190 ++++----- src/openrct2/ride/VehiclePaint.h | 28 +- .../ride/coaster/ReverserRollerCoaster.cpp | 6 +- src/openrct2/ride/coaster/VirginiaReel.cpp | 2 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 2 +- src/openrct2/ride/gentle/HauntedHouse.cpp | 2 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 2 +- src/openrct2/ride/gentle/MiniGolf.cpp | 4 +- src/openrct2/ride/gentle/ObservationTower.cpp | 2 +- src/openrct2/ride/gentle/SpaceRings.cpp | 2 +- src/openrct2/ride/thrill/Enterprise.cpp | 2 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 2 +- src/openrct2/ride/thrill/MagicCarpet.cpp | 6 +- src/openrct2/ride/thrill/MotionSimulator.cpp | 2 +- src/openrct2/ride/thrill/PirateShip.cpp | 2 +- src/openrct2/ride/thrill/RotoDrop.cpp | 2 +- .../ride/thrill/SwingingInverterShip.cpp | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 2 +- src/openrct2/ride/thrill/Twist.cpp | 2 +- src/openrct2/ride/water/RiverRapids.cpp | 2 +- src/openrct2/ride/water/SplashBoats.cpp | 2 +- src/openrct2/ride/water/SubmarineRide.cpp | 2 +- src/openrct2/world/Sprite.h | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 50 files changed, 509 insertions(+), 509 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index b40e314fb0..8046deda62 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -263,7 +263,7 @@ public: return window_scenarioselect_open( (scenarioselect_callback)intent->GetPointerExtra(INTENT_EXTRA_CALLBACK), false); case WD_VEHICLE: - return window_ride_open_vehicle((rct_vehicle*)intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)); + return window_ride_open_vehicle((Vehicle*)intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)); case WD_TRACK: return window_ride_open_track((TileElement*)intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)); case INTENT_ACTION_NEW_RIDE_OF_TYPE: @@ -374,7 +374,7 @@ public: case INTENT_ACTION_INVALIDATE_VEHICLE_WINDOW: { - auto vehicle = static_cast(intent.GetPointerExtra(INTENT_EXTRA_VEHICLE)); + auto vehicle = static_cast(intent.GetPointerExtra(INTENT_EXTRA_VEHICLE)); auto w = window_find_by_number(WC_RIDE, vehicle->ride); if (w == nullptr) return; diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 085a577eb8..f77c2e2364 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -55,7 +55,7 @@ int32_t viewport_interaction_get_item_left(ScreenCoordsXY screenCoords, viewport { TileElement* tileElement; rct_sprite* sprite; - rct_vehicle* vehicle; + Vehicle* vehicle; // No click input for title screen or scenario editor or track manager if (gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_MANAGER)) diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 305dc7cbff..0983840fab 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -1096,7 +1096,7 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi) */ static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi) { - rct_vehicle *train, *vehicle; + Vehicle *train, *vehicle; uint16_t train_index, vehicle_index; for (train_index = gSpriteListHead[SPRITE_LIST_VEHICLE_HEAD]; train_index != SPRITE_INDEX_NULL; train_index = train->next) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index a85185beb2..ca5e43f778 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1693,9 +1693,9 @@ rct_window* window_ride_open_track(TileElement* tileElement) * * rct2: 0x006ACAC2 */ -rct_window* window_ride_open_vehicle(rct_vehicle* vehicle) +rct_window* window_ride_open_vehicle(Vehicle* vehicle) { - rct_vehicle* headVehicle = vehicle_get_head(vehicle); + Vehicle* headVehicle = vehicle_get_head(vehicle); uint16_t headVehicleSpriteIndex = headVehicle->sprite_index; auto ride = get_ride(headVehicle->ride); if (ride == nullptr) @@ -1883,7 +1883,7 @@ static void window_ride_init_viewport(rct_window* w) rct_ride_entry* ride_entry = ride->GetRideEntry(); if (ride_entry && ride_entry->tab_vehicle != 0) { - rct_vehicle* vehicle = GET_VEHICLE(focus.sprite.sprite_id); + Vehicle* vehicle = GET_VEHICLE(focus.sprite.sprite_id); if (vehicle == nullptr) { focus.sprite.sprite_id = SPRITE_INDEX_NULL; @@ -2549,7 +2549,7 @@ static void window_ride_main_update(rct_window* w) if (vehicleSpriteIndex == SPRITE_INDEX_NULL) return; - rct_vehicle* vehicle = &(get_sprite(vehicleSpriteIndex)->vehicle); + Vehicle* vehicle = &(get_sprite(vehicleSpriteIndex)->vehicle); if (vehicle->status != VEHICLE_STATUS_TRAVELLING && vehicle->status != VEHICLE_STATUS_TRAVELLING_CABLE_LIFT && vehicle->status != VEHICLE_STATUS_TRAVELLING_DODGEMS && vehicle->status != VEHICLE_STATUS_TRAVELLING_BOAT) @@ -2755,7 +2755,7 @@ static rct_string_id window_ride_get_status_overall_view(rct_window* w, void* ar */ static rct_string_id window_ride_get_status_vehicle(rct_window* w, void* arguments) { - rct_vehicle* vehicle; + Vehicle* vehicle; int32_t vehicleIndex; uint16_t vehicleSpriteIndex; rct_string_id stringId; @@ -4094,7 +4094,7 @@ static void window_ride_maintenance_dropdown(rct_window* w, rct_widgetindex widg case WIDX_FORCE_BREAKDOWN: if (dropdownIndex == 0) { - rct_vehicle* vehicle; + Vehicle* vehicle; switch (ride->breakdown_reason_pending) { case BREAKDOWN_SAFETY_CUT_OUT: diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 670df82f97..3cab603c84 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -18,7 +18,7 @@ using loadsave_callback = void (*)(int32_t result, const utf8* path); using scenarioselect_callback = void (*)(const utf8* path); struct Peep; struct TileElement; -struct rct_vehicle; +struct Vehicle; rct_window* window_about_open(); rct_window* window_changelog_open(); @@ -115,7 +115,7 @@ void window_ride_list_refresh_list(rct_window* w); rct_window* window_ride_main_open(Ride* ride); rct_window* window_ride_open_track(TileElement* tileElement); -rct_window* window_ride_open_vehicle(rct_vehicle* vehicle); +rct_window* window_ride_open_vehicle(Vehicle* vehicle); void window_ride_measurements_design_cancel(); // rct2: 0x00F635EE diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index beace9f3a3..9b48d2de2e 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -64,7 +64,7 @@ struct GameStateSnapshot_t switch (sprite.generic.sprite_identifier) { case SPRITE_IDENTIFIER_VEHICLE: - ds << reinterpret_cast(sprite.vehicle); + ds << reinterpret_cast(sprite.vehicle); break; case SPRITE_IDENTIFIER_PEEP: ds << reinterpret_cast(sprite.peep); @@ -308,77 +308,77 @@ struct GameStateSnapshots : public IGameStateSnapshots } void CompareSpriteDataVehicle( - const rct_vehicle& spriteBase, const rct_vehicle& spriteCmp, GameStateSpriteChange_t& changeData) const + const Vehicle& spriteBase, const Vehicle& spriteCmp, GameStateSpriteChange_t& changeData) const { - COMPARE_FIELD(rct_vehicle, vehicle_sprite_type); - COMPARE_FIELD(rct_vehicle, bank_rotation); - COMPARE_FIELD(rct_vehicle, remaining_distance); - COMPARE_FIELD(rct_vehicle, velocity); - COMPARE_FIELD(rct_vehicle, acceleration); - COMPARE_FIELD(rct_vehicle, ride); - COMPARE_FIELD(rct_vehicle, vehicle_type); - COMPARE_FIELD(rct_vehicle, colours); - COMPARE_FIELD(rct_vehicle, track_progress); - COMPARE_FIELD(rct_vehicle, track_direction); - COMPARE_FIELD(rct_vehicle, track_x); - COMPARE_FIELD(rct_vehicle, track_y); - COMPARE_FIELD(rct_vehicle, track_z); - COMPARE_FIELD(rct_vehicle, next_vehicle_on_train); - COMPARE_FIELD(rct_vehicle, prev_vehicle_on_ride); - COMPARE_FIELD(rct_vehicle, next_vehicle_on_ride); - COMPARE_FIELD(rct_vehicle, var_44); - COMPARE_FIELD(rct_vehicle, mass); - COMPARE_FIELD(rct_vehicle, update_flags); - COMPARE_FIELD(rct_vehicle, swing_sprite); - COMPARE_FIELD(rct_vehicle, current_station); - COMPARE_FIELD(rct_vehicle, swinging_car_var_0); - COMPARE_FIELD(rct_vehicle, var_4E); - COMPARE_FIELD(rct_vehicle, status); - COMPARE_FIELD(rct_vehicle, sub_state); + COMPARE_FIELD(Vehicle, vehicle_sprite_type); + COMPARE_FIELD(Vehicle, bank_rotation); + COMPARE_FIELD(Vehicle, remaining_distance); + COMPARE_FIELD(Vehicle, velocity); + COMPARE_FIELD(Vehicle, acceleration); + COMPARE_FIELD(Vehicle, ride); + COMPARE_FIELD(Vehicle, vehicle_type); + COMPARE_FIELD(Vehicle, colours); + COMPARE_FIELD(Vehicle, track_progress); + COMPARE_FIELD(Vehicle, track_direction); + COMPARE_FIELD(Vehicle, track_x); + COMPARE_FIELD(Vehicle, track_y); + COMPARE_FIELD(Vehicle, track_z); + COMPARE_FIELD(Vehicle, next_vehicle_on_train); + COMPARE_FIELD(Vehicle, prev_vehicle_on_ride); + COMPARE_FIELD(Vehicle, next_vehicle_on_ride); + COMPARE_FIELD(Vehicle, var_44); + COMPARE_FIELD(Vehicle, mass); + COMPARE_FIELD(Vehicle, update_flags); + COMPARE_FIELD(Vehicle, swing_sprite); + COMPARE_FIELD(Vehicle, current_station); + COMPARE_FIELD(Vehicle, swinging_car_var_0); + COMPARE_FIELD(Vehicle, var_4E); + COMPARE_FIELD(Vehicle, status); + COMPARE_FIELD(Vehicle, sub_state); for (int i = 0; i < 32; i++) { - COMPARE_FIELD(rct_vehicle, peep[i]); + COMPARE_FIELD(Vehicle, peep[i]); } for (int i = 0; i < 32; i++) { - COMPARE_FIELD(rct_vehicle, peep_tshirt_colours[i]); + COMPARE_FIELD(Vehicle, peep_tshirt_colours[i]); } - COMPARE_FIELD(rct_vehicle, num_seats); - COMPARE_FIELD(rct_vehicle, num_peeps); - COMPARE_FIELD(rct_vehicle, next_free_seat); - COMPARE_FIELD(rct_vehicle, restraints_position); - COMPARE_FIELD(rct_vehicle, spin_speed); - COMPARE_FIELD(rct_vehicle, sound2_flags); - COMPARE_FIELD(rct_vehicle, spin_sprite); - COMPARE_FIELD(rct_vehicle, sound1_id); - COMPARE_FIELD(rct_vehicle, sound1_volume); - COMPARE_FIELD(rct_vehicle, sound2_id); - COMPARE_FIELD(rct_vehicle, sound2_volume); - COMPARE_FIELD(rct_vehicle, sound_vector_factor); - COMPARE_FIELD(rct_vehicle, cable_lift_target); - COMPARE_FIELD(rct_vehicle, speed); - COMPARE_FIELD(rct_vehicle, powered_acceleration); - COMPARE_FIELD(rct_vehicle, var_C4); - COMPARE_FIELD(rct_vehicle, animation_frame); + COMPARE_FIELD(Vehicle, num_seats); + COMPARE_FIELD(Vehicle, num_peeps); + COMPARE_FIELD(Vehicle, next_free_seat); + COMPARE_FIELD(Vehicle, restraints_position); + COMPARE_FIELD(Vehicle, spin_speed); + COMPARE_FIELD(Vehicle, sound2_flags); + COMPARE_FIELD(Vehicle, spin_sprite); + COMPARE_FIELD(Vehicle, sound1_id); + COMPARE_FIELD(Vehicle, sound1_volume); + COMPARE_FIELD(Vehicle, sound2_id); + COMPARE_FIELD(Vehicle, sound2_volume); + COMPARE_FIELD(Vehicle, sound_vector_factor); + COMPARE_FIELD(Vehicle, cable_lift_target); + COMPARE_FIELD(Vehicle, speed); + COMPARE_FIELD(Vehicle, powered_acceleration); + COMPARE_FIELD(Vehicle, var_C4); + COMPARE_FIELD(Vehicle, animation_frame); for (int i = 0; i < 2; i++) { - COMPARE_FIELD(rct_vehicle, pad_C6[i]); + COMPARE_FIELD(Vehicle, pad_C6[i]); } - COMPARE_FIELD(rct_vehicle, var_C8); - COMPARE_FIELD(rct_vehicle, var_CA); - COMPARE_FIELD(rct_vehicle, scream_sound_id); - COMPARE_FIELD(rct_vehicle, TrackSubposition); - COMPARE_FIELD(rct_vehicle, num_laps); - COMPARE_FIELD(rct_vehicle, brake_speed); - COMPARE_FIELD(rct_vehicle, lost_time_out); - COMPARE_FIELD(rct_vehicle, vertical_drop_countdown); - COMPARE_FIELD(rct_vehicle, var_D3); - COMPARE_FIELD(rct_vehicle, mini_golf_current_animation); - COMPARE_FIELD(rct_vehicle, mini_golf_flags); - COMPARE_FIELD(rct_vehicle, ride_subtype); - COMPARE_FIELD(rct_vehicle, colours_extended); - COMPARE_FIELD(rct_vehicle, seat_rotation); - COMPARE_FIELD(rct_vehicle, target_seat_rotation); + COMPARE_FIELD(Vehicle, var_C8); + COMPARE_FIELD(Vehicle, var_CA); + COMPARE_FIELD(Vehicle, scream_sound_id); + COMPARE_FIELD(Vehicle, TrackSubposition); + COMPARE_FIELD(Vehicle, num_laps); + COMPARE_FIELD(Vehicle, brake_speed); + COMPARE_FIELD(Vehicle, lost_time_out); + COMPARE_FIELD(Vehicle, vertical_drop_countdown); + COMPARE_FIELD(Vehicle, var_D3); + COMPARE_FIELD(Vehicle, mini_golf_current_animation); + COMPARE_FIELD(Vehicle, mini_golf_flags); + COMPARE_FIELD(Vehicle, ride_subtype); + COMPARE_FIELD(Vehicle, colours_extended); + COMPARE_FIELD(Vehicle, seat_rotation); + COMPARE_FIELD(Vehicle, target_seat_rotation); } void CompareSpriteDataLitter( diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 4a191c476a..7d9dc03552 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -712,11 +712,11 @@ void lightfx_add_lights_magic_vehicles() uint16_t spriteIndex = gSpriteListHead[SPRITE_LIST_VEHICLE_HEAD]; while (spriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = &(get_sprite(spriteIndex)->vehicle); + Vehicle* vehicle = &(get_sprite(spriteIndex)->vehicle); uint16_t vehicleID = spriteIndex; spriteIndex = vehicle->next; - rct_vehicle* mother_vehicle = vehicle; + Vehicle* mother_vehicle = vehicle; if (mother_vehicle->ride_subtype == RIDE_ENTRY_INDEX_NULL) { @@ -789,7 +789,7 @@ void lightfx_add_lights_magic_vehicles() case RIDE_TYPE_SPLASH_BOATS: case RIDE_TYPE_WATER_COASTER: { - rct_vehicle* vehicle_draw = vehicle_get_head(vehicle); + Vehicle* vehicle_draw = vehicle_get_head(vehicle); if (vehicle_draw->next_vehicle_on_train != SPRITE_INDEX_NULL) { vehicle_draw = GET_VEHICLE(vehicle_draw->next_vehicle_on_train); diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 2e4f9ef343..5464f46888 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -257,7 +257,7 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv) uint16_t vehicle_index = ride->vehicles[i]; while (vehicle_index != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = GET_VEHICLE(vehicle_index); + Vehicle* vehicle = GET_VEHICLE(vehicle_index); vehicle->mass = mass; vehicle_index = vehicle->next_vehicle_on_train; } diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index c6b03005be..62e2dadc81 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -21,7 +21,7 @@ struct paint_struct; struct rct_drawpixelinfo; struct Peep; struct TileElement; -struct rct_vehicle; +struct Vehicle; struct rct_window; union paint_entry; union rct_sprite; @@ -94,7 +94,7 @@ struct viewport_interaction_info TileElement* tileElement; rct_sprite* sprite; Peep* peep; - rct_vehicle* vehicle; + Vehicle* vehicle; }; }; diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index cd1596b2d9..b609bc3ac3 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -211,7 +211,7 @@ void news_item_get_subject_location(int32_t type, int32_t subject, int32_t* x, i { Ride* ride; Peep* peep; - rct_vehicle* vehicle; + Vehicle* vehicle; switch (type) { diff --git a/src/openrct2/paint/sprite/Paint.Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp index 11a91a178e..57b83a29db 100644 --- a/src/openrct2/paint/sprite/Paint.Sprite.cpp +++ b/src/openrct2/paint/sprite/Paint.Sprite.cpp @@ -110,7 +110,7 @@ void sprite_paint_setup(paint_session* session, const uint16_t x, const uint16_t switch (spr->generic.sprite_identifier) { case SPRITE_IDENTIFIER_VEHICLE: - vehicle_paint(session, (rct_vehicle*)spr, image_direction); + vehicle_paint(session, (Vehicle*)spr, image_direction); break; case SPRITE_IDENTIFIER_PEEP: peep_paint(session, (Peep*)spr, image_direction); diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index fa583dd391..d13896b5fa 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -2458,7 +2458,7 @@ static void peep_ride_is_too_intense(Guest* peep, Ride* ride, bool peepAtRide) * * rct2: 0x00691C6E */ -static rct_vehicle* peep_choose_car_from_ride(Peep* peep, Ride* ride, std::vector& car_array) +static Vehicle* peep_choose_car_from_ride(Peep* peep, Ride* ride, std::vector& car_array) { uint8_t chosen_car = scenario_rand(); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_G_FORCES) && ((chosen_car & 0xC) != 0xC)) @@ -2472,7 +2472,7 @@ static rct_vehicle* peep_choose_car_from_ride(Peep* peep, Ride* ride, std::vecto peep->current_car = car_array[chosen_car]; - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); for (int32_t i = peep->current_car; i > 0; --i) { @@ -2486,7 +2486,7 @@ static rct_vehicle* peep_choose_car_from_ride(Peep* peep, Ride* ride, std::vecto * * rct2: 0x00691CD1 */ -static void peep_choose_seat_from_car(Peep* peep, Ride* ride, rct_vehicle* vehicle) +static void peep_choose_seat_from_car(Peep* peep, Ride* ride, Vehicle* vehicle) { uint8_t chosen_seat = vehicle->next_free_seat; @@ -2568,7 +2568,7 @@ static bool peep_find_vehicle_to_enter(Guest* peep, Ride* ride, std::vectornum_vehicles; ++i) { - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[i]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[i]); if (vehicle->next_free_seat >= vehicle->num_seats) continue; @@ -2593,7 +2593,7 @@ static bool peep_find_vehicle_to_enter(Guest* peep, Ride* ride, std::vectorvehicles[chosen_train]; - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; for (; vehicle_id != SPRITE_INDEX_NULL; vehicle_id = vehicle->next_vehicle_on_train, i++) { @@ -3528,7 +3528,7 @@ void Guest::UpdateRideAtEntrance() if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_NO_VEHICLES)) { - rct_vehicle* vehicle = peep_choose_car_from_ride(this, ride, carArray); + Vehicle* vehicle = peep_choose_car_from_ride(this, ride, carArray); peep_choose_seat_from_car(this, ride, vehicle); } peep_go_to_ride_entrance(this, ride); @@ -3739,7 +3739,7 @@ void Guest::UpdateRideAdvanceThroughEntrance() } } - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); for (int32_t i = current_car; i != 0; --i) { vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); @@ -3960,7 +3960,7 @@ void Guest::UpdateRideFreeVehicleCheck() return; } - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); for (int32_t i = current_car; i != 0; --i) { vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); @@ -3981,8 +3981,8 @@ void Guest::UpdateRideFreeVehicleCheck() if (ride->vehicles[i] == SPRITE_INDEX_NULL) continue; - rct_vehicle* train = GET_VEHICLE(ride->vehicles[i]); - rct_vehicle* second_vehicle = GET_VEHICLE(train->next_vehicle_on_train); + Vehicle* train = GET_VEHICLE(ride->vehicles[i]); + Vehicle* second_vehicle = GET_VEHICLE(train->next_vehicle_on_train); if (second_vehicle->num_peeps == 0) continue; @@ -4018,7 +4018,7 @@ void Guest::UpdateRideFreeVehicleCheck() } } - rct_vehicle* currentTrain = GET_VEHICLE(ride->vehicles[current_train]); + Vehicle* currentTrain = GET_VEHICLE(ride->vehicles[current_train]); if (ride->status == RIDE_STATUS_OPEN && ++rejoin_queue_timeout != 0 && !(currentTrain->update_flags & VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART)) { @@ -4114,7 +4114,7 @@ void Guest::UpdateRideLeaveVehicle() if (ride == nullptr) return; - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); uint8_t ride_station = vehicle->current_station; for (int32_t i = current_car; i != 0; --i) @@ -4461,7 +4461,7 @@ void Guest::UpdateRideApproachVehicleWaypoints() // This is incrementing the actual peep waypoint var_37++; - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); CoordsXY targetLoc; targetLoc.x = ride->stations[current_ride_station].Start.x * 32 + 16; @@ -4532,7 +4532,7 @@ void Guest::UpdateRideApproachExitWaypoints() } var_37--; - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[current_train]); CoordsXY targetLoc; targetLoc.x = ride->stations[current_ride_station].Start.x * 32 + 16; targetLoc.y = ride->stations[current_ride_station].Start.y * 32 + 16; diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 1e170dce85..cf0bff55ef 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -2199,7 +2199,7 @@ bool Staff::UpdateFixingMoveToBrokenDownVehicle(bool firstRun, Ride* ride) { if (!firstRun) { - rct_vehicle* vehicle = ride_get_broken_vehicle(ride); + Vehicle* vehicle = ride_get_broken_vehicle(ride); if (vehicle == nullptr) { return true; @@ -2281,7 +2281,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, Ride* ride) return false; } - rct_vehicle* vehicle = ride_get_broken_vehicle(ride); + Vehicle* vehicle = ride_get_broken_vehicle(ride); if (vehicle == nullptr) { return true; @@ -2322,7 +2322,7 @@ bool Staff::UpdateFixingFixVehicleMalfunction(bool firstRun, Ride* ride) return false; } - rct_vehicle* vehicle = ride_get_broken_vehicle(ride); + Vehicle* vehicle = ride_get_broken_vehicle(ride); if (vehicle == nullptr) { return true; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index a987aa516a..4b1dcf6db3 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1102,7 +1102,7 @@ private: void ImportVehicles() { - std::vector vehicles; + std::vector vehicles; uint16_t spriteIndexMap[RCT1_MAX_SPRITES]; for (int i = 0; i < RCT1_MAX_SPRITES; i++) { @@ -1112,7 +1112,7 @@ private: rct1_vehicle* srcVehicle = &_s4.sprites[i].vehicle; if (srcVehicle->x != LOCATION_NULL) { - rct_vehicle* vehicle = (rct_vehicle*)create_sprite(SPRITE_IDENTIFIER_VEHICLE); + Vehicle* vehicle = (Vehicle*)create_sprite(SPRITE_IDENTIFIER_VEHICLE); spriteIndexMap[i] = vehicle->sprite_index; vehicles.push_back(vehicle); @@ -1133,7 +1133,7 @@ private: FixRideVehicleLinks(spriteIndexMap); } - void ImportVehicle(rct_vehicle* dst, rct1_vehicle* src) + void ImportVehicle(Vehicle* dst, rct1_vehicle* src) { auto ride = get_ride(src->ride); if (ride == nullptr) @@ -1239,7 +1239,7 @@ private: dst->next_free_seat = src->next_free_seat; } - void SetVehicleColours(rct_vehicle* dst, rct1_vehicle* src) + void SetVehicleColours(Vehicle* dst, rct1_vehicle* src) { rct1_ride* srcRide = &_s4.rides[src->ride]; uint8_t vehicleTypeIndex = srcRide->vehicle_type; @@ -1287,7 +1287,7 @@ private: } } - void FixVehicleLinks(rct_vehicle* vehicle, const uint16_t* spriteIndexMap) + void FixVehicleLinks(Vehicle* vehicle, const uint16_t* spriteIndexMap) { if (vehicle->prev_vehicle_on_ride != SPRITE_INDEX_NULL) { @@ -1303,7 +1303,7 @@ private: } } - void FixVehiclePeepLinks(rct_vehicle* vehicle, const uint16_t* spriteIndexMap) + void FixVehiclePeepLinks(Vehicle* vehicle, const uint16_t* spriteIndexMap) { for (auto& peep : vehicle->peep) { @@ -1331,7 +1331,7 @@ private: rct_sprite* sprite = get_sprite(i); if (sprite->generic.sprite_identifier == SPRITE_IDENTIFIER_VEHICLE) { - rct_vehicle* vehicle = (rct_vehicle*)sprite; + Vehicle* vehicle = (Vehicle*)sprite; FixVehiclePeepLinks(vehicle, spriteIndexMap); } } diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index e1b66d3926..0357de630c 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -978,7 +978,7 @@ void S6Exporter::ExportSpriteCommonProperties(RCT12SpriteBase* dst, const Sprite dst->sprite_direction = src->sprite_direction; } -void S6Exporter::ExportSpriteVehicle(RCT2SpriteVehicle* dst, const rct_vehicle* src) +void S6Exporter::ExportSpriteVehicle(RCT2SpriteVehicle* dst, const Vehicle* src) { ExportSpriteCommonProperties(dst, (const SpriteBase*)src); dst->vehicle_sprite_type = src->vehicle_sprite_type; diff --git a/src/openrct2/rct2/S6Exporter.h b/src/openrct2/rct2/S6Exporter.h index 36395c2fdd..a37dd18fe8 100644 --- a/src/openrct2/rct2/S6Exporter.h +++ b/src/openrct2/rct2/S6Exporter.h @@ -45,7 +45,7 @@ public: void ExportSprites(); void ExportSprite(RCT2Sprite* dst, const rct_sprite* src); void ExportSpriteCommonProperties(RCT12SpriteBase* dst, const SpriteBase* src); - void ExportSpriteVehicle(RCT2SpriteVehicle* dst, const rct_vehicle* src); + void ExportSpriteVehicle(RCT2SpriteVehicle* dst, const Vehicle* src); void ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src); void ExportSpriteMisc(RCT12SpriteBase* dst, const SpriteBase* src); void ExportSpriteLitter(RCT12SpriteLitter* dst, const Litter* src); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index fd17541143..46dcbcd022 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1289,7 +1289,7 @@ public: } } - void ImportSpriteVehicle(rct_vehicle* dst, const RCT2SpriteVehicle* src) + void ImportSpriteVehicle(Vehicle* dst, const RCT2SpriteVehicle* src) { ImportSpriteCommonProperties((SpriteBase*)dst, src); dst->vehicle_sprite_type = src->vehicle_sprite_type; diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 4700ea56cc..dfe2084945 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -20,16 +20,16 @@ #include -static void cable_lift_update_moving_to_end_of_station(rct_vehicle* vehicle); -static void cable_lift_update_waiting_to_depart(rct_vehicle* vehicle); -static void cable_lift_update_departing(rct_vehicle* vehicle); -static void cable_lift_update_travelling(rct_vehicle* vehicle); -static void cable_lift_update_arriving(rct_vehicle* vehicle); +static void cable_lift_update_moving_to_end_of_station(Vehicle* vehicle); +static void cable_lift_update_waiting_to_depart(Vehicle* vehicle); +static void cable_lift_update_departing(Vehicle* vehicle); +static void cable_lift_update_travelling(Vehicle* vehicle); +static void cable_lift_update_arriving(Vehicle* vehicle); -rct_vehicle* cable_lift_segment_create( +Vehicle* cable_lift_segment_create( Ride& ride, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance, bool head) { - rct_vehicle* current = &(create_sprite(SPRITE_IDENTIFIER_VEHICLE)->vehicle); + Vehicle* current = &(create_sprite(SPRITE_IDENTIFIER_VEHICLE)->vehicle); current->sprite_identifier = SPRITE_IDENTIFIER_VEHICLE; current->ride = ride.id; current->ride_subtype = RIDE_ENTRY_INDEX_NULL; @@ -89,7 +89,7 @@ rct_vehicle* cable_lift_segment_create( return current; } -void cable_lift_update(rct_vehicle* vehicle) +void cable_lift_update(Vehicle* vehicle) { switch (vehicle->status) { @@ -120,7 +120,7 @@ void cable_lift_update(rct_vehicle* vehicle) * * rct2: 0x006DF8A4 */ -static void cable_lift_update_moving_to_end_of_station(rct_vehicle* vehicle) +static void cable_lift_update_moving_to_end_of_station(Vehicle* vehicle) { if (vehicle->velocity >= -439800) vehicle->acceleration = -2932; @@ -143,7 +143,7 @@ static void cable_lift_update_moving_to_end_of_station(rct_vehicle* vehicle) * * rct2: 0x006DF8F1 */ -static void cable_lift_update_waiting_to_depart(rct_vehicle* vehicle) +static void cable_lift_update_waiting_to_depart(Vehicle* vehicle) { if (vehicle->velocity >= -58640) vehicle->acceleration = -14660; @@ -159,8 +159,8 @@ static void cable_lift_update_waiting_to_depart(rct_vehicle* vehicle) // Next check to see if the second part of the cable lift // is at the front of the passenger vehicle to simulate the // cable being attached underneath the train. - rct_vehicle* passengerVehicle = GET_VEHICLE(vehicle->cable_lift_target); - rct_vehicle* cableLiftSecondPart = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + Vehicle* passengerVehicle = GET_VEHICLE(vehicle->cable_lift_target); + Vehicle* cableLiftSecondPart = GET_VEHICLE(vehicle->prev_vehicle_on_ride); int16_t dist_x = abs(passengerVehicle->x - cableLiftSecondPart->x); int16_t dist_y = abs(passengerVehicle->y - cableLiftSecondPart->y); @@ -177,13 +177,13 @@ static void cable_lift_update_waiting_to_depart(rct_vehicle* vehicle) * * rct2: 0x006DF97A */ -static void cable_lift_update_departing(rct_vehicle* vehicle) +static void cable_lift_update_departing(Vehicle* vehicle) { vehicle->sub_state++; if (vehicle->sub_state < 16) return; - rct_vehicle* passengerVehicle = GET_VEHICLE(vehicle->cable_lift_target); + Vehicle* passengerVehicle = GET_VEHICLE(vehicle->cable_lift_target); vehicle->SetState(VEHICLE_STATUS_TRAVELLING, vehicle->sub_state); passengerVehicle->SetState(VEHICLE_STATUS_TRAVELLING_CABLE_LIFT, passengerVehicle->sub_state); } @@ -192,9 +192,9 @@ static void cable_lift_update_departing(rct_vehicle* vehicle) * * rct2: 0x006DF99C */ -static void cable_lift_update_travelling(rct_vehicle* vehicle) +static void cable_lift_update_travelling(Vehicle* vehicle) { - rct_vehicle* passengerVehicle = GET_VEHICLE(vehicle->cable_lift_target); + Vehicle* passengerVehicle = GET_VEHICLE(vehicle->cable_lift_target); vehicle->velocity = std::min(passengerVehicle->velocity, 439800); vehicle->acceleration = 0; @@ -213,14 +213,14 @@ static void cable_lift_update_travelling(rct_vehicle* vehicle) * * rct2: 0x006DF9F0 */ -static void cable_lift_update_arriving(rct_vehicle* vehicle) +static void cable_lift_update_arriving(Vehicle* vehicle) { vehicle->sub_state++; if (vehicle->sub_state >= 64) vehicle->SetState(VEHICLE_STATUS_MOVING_TO_END_OF_STATION, vehicle->sub_state); } -static bool sub_6DF01A_loop(rct_vehicle* vehicle) +static bool sub_6DF01A_loop(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -303,7 +303,7 @@ static bool sub_6DF01A_loop(rct_vehicle* vehicle) return true; } -static bool sub_6DF21B_loop(rct_vehicle* vehicle) +static bool sub_6DF21B_loop(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -391,7 +391,7 @@ static bool sub_6DF21B_loop(rct_vehicle* vehicle) * * rct2: 0x006DEF56 */ -int32_t cable_lift_update_track_motion(rct_vehicle* cableLift) +int32_t cable_lift_update_track_motion(Vehicle* cableLift) { _vehicleF64E2C = 0; gCurrentVehicle = cableLift; @@ -402,7 +402,7 @@ int32_t cable_lift_update_track_motion(rct_vehicle* cableLift) _vehicleVelocityF64E08 = cableLift->velocity; _vehicleVelocityF64E0C = (cableLift->velocity / 1024) * 42; - rct_vehicle* frontVehicle = cableLift; + Vehicle* frontVehicle = cableLift; if (cableLift->velocity < 0) { frontVehicle = vehicle_get_tail(cableLift); @@ -410,7 +410,7 @@ int32_t cable_lift_update_track_motion(rct_vehicle* cableLift) _vehicleFrontVehicle = frontVehicle; - for (rct_vehicle* vehicle = frontVehicle;;) + for (Vehicle* vehicle = frontVehicle;;) { vehicle->acceleration = dword_9A2970[vehicle->vehicle_sprite_type]; _vehicleUnkF64E10 = 1; @@ -482,7 +482,7 @@ int32_t cable_lift_update_track_motion(rct_vehicle* cableLift) for (uint16_t spriteId = cableLift->sprite_index; spriteId != SPRITE_INDEX_NULL;) { - rct_vehicle* vehicle = GET_VEHICLE(spriteId); + Vehicle* vehicle = GET_VEHICLE(spriteId); vehicleCount++; massTotal += vehicle->mass; diff --git a/src/openrct2/ride/CableLift.h b/src/openrct2/ride/CableLift.h index 2a868fa674..447ccf4d8a 100644 --- a/src/openrct2/ride/CableLift.h +++ b/src/openrct2/ride/CableLift.h @@ -13,9 +13,9 @@ #include "../common.h" #include "Vehicle.h" -rct_vehicle* cable_lift_segment_create( +Vehicle* cable_lift_segment_create( Ride& ride, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance, bool head); -void cable_lift_update(rct_vehicle* vehicle); -int32_t cable_lift_update_track_motion(rct_vehicle* cableLift); +void cable_lift_update(Vehicle* vehicle); +int32_t cable_lift_update_track_motion(Vehicle* cableLift); #endif diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 1f9f0223fb..93349fe666 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -1012,7 +1012,7 @@ static void ride_remove_cable_lift(Ride* ride) uint16_t spriteIndex = ride->cable_lift; do { - rct_vehicle* vehicle = GET_VEHICLE(spriteIndex); + Vehicle* vehicle = GET_VEHICLE(spriteIndex); invalidate_sprite_2((rct_sprite*)vehicle); sprite_remove((rct_sprite*)vehicle); spriteIndex = vehicle->next_vehicle_on_train; @@ -1036,7 +1036,7 @@ static void ride_remove_vehicles(Ride* ride) uint16_t spriteIndex = ride->vehicles[i]; while (spriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = GET_VEHICLE(spriteIndex); + Vehicle* vehicle = GET_VEHICLE(spriteIndex); invalidate_sprite_2((rct_sprite*)vehicle); sprite_remove((rct_sprite*)vehicle); spriteIndex = vehicle->next_vehicle_on_train; @@ -2487,7 +2487,7 @@ void ride_prepare_breakdown(Ride* ride, int32_t breakdownReason) { int32_t i; uint16_t vehicleSpriteIdx; - rct_vehicle* vehicle; + Vehicle* vehicle; if (ride->lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED)) return; @@ -2839,7 +2839,7 @@ static void ride_music_update(Ride* ride) uint16_t vehicleSpriteIdx = ride->vehicles[0]; if (vehicleSpriteIdx != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); + Vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); if (vehicle->status != VEHICLE_STATUS_DOING_CIRCUS_SHOW) { ride->music_tune_id = 255; @@ -4381,7 +4381,7 @@ static constexpr const CoordsXY word_9A2A60[] = { * * rct2: 0x006DD90D */ -static rct_vehicle* vehicle_create_car( +static Vehicle* vehicle_create_car( ride_id_t rideIndex, int32_t vehicleEntryIndex, int32_t carIndex, int32_t vehicleIndex, int32_t x, int32_t y, int32_t z, int32_t* remainingDistance, TileElement* tileElement) { @@ -4661,9 +4661,9 @@ static void vehicle_create_trains(ride_id_t rideIndex, int32_t x, int32_t y, int lastTrain.tail->next_vehicle_on_ride = firstTrain.head->sprite_index; } -static void vehicle_unset_update_flag_b1(rct_vehicle* head) +static void vehicle_unset_update_flag_b1(Vehicle* head) { - rct_vehicle* vehicle = head; + Vehicle* vehicle = head; while (true) { vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_1; @@ -4682,7 +4682,7 @@ static void vehicle_unset_update_flag_b1(rct_vehicle* head) */ static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYElement) { - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[0]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[0]); auto curTrackPos = CoordsXYZ{ vehicle->track_x, vehicle->track_y, vehicle->track_z }; auto curTrackElement = map_get_track_element_at(curTrackPos); @@ -4813,7 +4813,7 @@ static bool ride_create_vehicles(Ride* ride, CoordsXYE* element, int32_t isApply { for (int32_t i = 0; i < ride->num_vehicles; i++) { - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[i]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[i]); rct_ride_entry_vehicle* vehicleEntry = vehicle_get_vehicle_entry(vehicle); @@ -4836,7 +4836,7 @@ static bool ride_create_vehicles(Ride* ride, CoordsXYE* element, int32_t isApply */ void loc_6DDF9C(Ride* ride, TileElement* tileElement) { - rct_vehicle *train, *car; + Vehicle *train, *car; for (int32_t i = 0; i < ride->num_vehicles; i++) { @@ -5046,8 +5046,8 @@ static bool ride_create_cable_lift(ride_id_t rideIndex, bool isApplying) auto tileElement = map_get_track_element_at(cableLiftLoc); int32_t direction = tileElement->GetDirection(); - rct_vehicle* head = nullptr; - rct_vehicle* tail = nullptr; + Vehicle* head = nullptr; + Vehicle* tail = nullptr; uint32_t ebx = 0; for (int32_t i = 0; i < 5; i++) { @@ -5058,7 +5058,7 @@ static bool ride_create_cable_lift(ride_id_t rideIndex, bool isApplying) int32_t remaining_distance = ebx; ebx -= edx; - rct_vehicle* current = cable_lift_segment_create( + Vehicle* current = cable_lift_segment_create( *ride, cableLiftLoc.x, cableLiftLoc.y, cableLiftLoc.z / 8, direction, var_44, remaining_distance, i == 0); current->next_vehicle_on_train = SPRITE_INDEX_NULL; if (i == 0) @@ -6447,7 +6447,7 @@ void invalidate_test_results(Ride* ride) uint16_t spriteIndex = ride->vehicles[i]; if (spriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = GET_VEHICLE(spriteIndex); + Vehicle* vehicle = GET_VEHICLE(spriteIndex); vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_TESTING; } } @@ -6476,7 +6476,7 @@ void ride_fix_breakdown(Ride* ride, int32_t reliabilityIncreaseFactor) uint16_t spriteIndex = ride->vehicles[i]; while (spriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = GET_VEHICLE(spriteIndex); + Vehicle* vehicle = GET_VEHICLE(spriteIndex); vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_ZERO_VELOCITY; vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_BROKEN_CAR; vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_BROKEN_TRAIN; @@ -6508,7 +6508,7 @@ void ride_update_vehicle_colours(Ride* ride) while (spriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = GET_VEHICLE(spriteIndex); + Vehicle* vehicle = GET_VEHICLE(spriteIndex); switch (ride->colour_scheme_type & 3) { case RIDE_COLOUR_SCHEME_ALL_SAME: @@ -7118,7 +7118,7 @@ void Ride::SetToDefaultInspectionInterval() */ void Ride::Crash(uint8_t vehicleIndex) { - rct_vehicle* vehicle = GET_VEHICLE(vehicles[vehicleIndex]); + Vehicle* vehicle = GET_VEHICLE(vehicles[vehicleIndex]); if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) { @@ -7191,7 +7191,7 @@ uint32_t ride_customers_in_last_5_minutes(const Ride* ride) return sum; } -rct_vehicle* ride_get_broken_vehicle(Ride* ride) +Vehicle* ride_get_broken_vehicle(Ride* ride) { uint16_t vehicleIndex = ride->vehicles[ride->broken_vehicle]; @@ -7200,7 +7200,7 @@ rct_vehicle* ride_get_broken_vehicle(Ride* ride) return nullptr; } - rct_vehicle* vehicle = GET_VEHICLE(vehicleIndex); + Vehicle* vehicle = GET_VEHICLE(vehicleIndex); for (uint8_t i = 0; i < ride->broken_car; i++) { vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); @@ -7537,7 +7537,7 @@ void fix_invalid_vehicle_sprite_sizes() uint16_t rideSpriteIndex = ride.vehicles[j]; while (rideSpriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle = try_get_vehicle(rideSpriteIndex); + Vehicle* vehicle = try_get_vehicle(rideSpriteIndex); if (vehicle == nullptr) { break; diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 78cbec6381..1c635792ea 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -1252,7 +1252,7 @@ void window_ride_construction_mouseup_demolish_next_piece(int32_t x, int32_t y, uint32_t ride_customers_per_hour(const Ride* ride); uint32_t ride_customers_in_last_5_minutes(const Ride* ride); -rct_vehicle* ride_get_broken_vehicle(Ride* ride); +Vehicle* ride_get_broken_vehicle(Ride* ride); void window_ride_construction_do_station_check(); void window_ride_construction_do_entrance_exit_check(); diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index 16098aacc4..d90533b2d1 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -104,7 +104,7 @@ static void ride_update_station_bumpercar(Ride* ride, int32_t stationIndex) if (vehicleSpriteIdx == SPRITE_INDEX_NULL) continue; - rct_vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); + Vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); if (vehicle->var_CE < dh || (vehicle->var_CE < dh && vehicle->sub_state > dl)) continue; @@ -126,7 +126,7 @@ static void ride_update_station_bumpercar(Ride* ride, int32_t stationIndex) if (vehicleSpriteIdx == SPRITE_INDEX_NULL) continue; - rct_vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); + Vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART) { ride->stations[stationIndex].Depart &= ~STATION_DEPART_FLAG; @@ -201,7 +201,7 @@ static void ride_update_station_race(Ride* ride, int32_t stationIndex) if (vehicleSpriteIdx == SPRITE_INDEX_NULL) continue; - rct_vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); + Vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART && vehicle->num_laps >= numLaps) { // Found a winner @@ -235,7 +235,7 @@ static void ride_update_station_race(Ride* ride, int32_t stationIndex) if (vehicleSpriteIdx == SPRITE_INDEX_NULL) continue; - rct_vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); + Vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART && vehicle->status != VEHICLE_STATUS_DEPARTING) { if (ride->stations[stationIndex].Depart & STATION_DEPART_FLAG) @@ -273,7 +273,7 @@ static void ride_race_init_vehicle_speeds(Ride* ride) if (vehicleSpriteIdx == SPRITE_INDEX_NULL) continue; - rct_vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); + Vehicle* vehicle = GET_VEHICLE(vehicleSpriteIdx); vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_6; rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 19dfc8fb34..f51156171d 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -1149,7 +1149,7 @@ int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank) return bank; } -int32_t track_get_actual_bank_3(rct_vehicle* vehicle, TileElement* tileElement) +int32_t track_get_actual_bank_3(Vehicle* vehicle, TileElement* tileElement) { auto trackType = tileElement->AsTrack()->GetTrackType(); auto bankStart = TrackDefinitions[trackType].bank_start; diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 00cf1af477..e2a323acb4 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -541,7 +541,7 @@ bool track_element_is_station(TileElement* trackElement); int32_t track_get_actual_bank(TileElement* tileElement, int32_t bank); int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank); -int32_t track_get_actual_bank_3(rct_vehicle* vehicle, TileElement* tileElement); +int32_t track_get_actual_bank_3(Vehicle* vehicle, TileElement* tileElement); bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags); bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags); diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index a8746dd98c..52571a22e8 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -44,47 +44,47 @@ #include #include -static void vehicle_update(rct_vehicle* vehicle); -static void vehicle_update_crossings(const rct_vehicle* vehicle); -static void vehicle_claxon(const rct_vehicle* vehicle); +static void vehicle_update(Vehicle* vehicle); +static void vehicle_update_crossings(const Vehicle* vehicle); +static void vehicle_claxon(const Vehicle* vehicle); -static void vehicle_update_showing_film(rct_vehicle* vehicle); -static void vehicle_update_doing_circus_show(rct_vehicle* vehicle); -static void vehicle_update_moving_to_end_of_station(rct_vehicle* vehicle); -static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle); -static void vehicle_update_waiting_to_depart(rct_vehicle* vehicle); -static void vehicle_update_departing(rct_vehicle* vehicle); -static void vehicle_finish_departing(rct_vehicle* vehicle); -static void vehicle_update_travelling(rct_vehicle* vehicle); -static void vehicle_update_ferris_wheel_rotating(rct_vehicle* vehicle); -static void vehicle_update_rotating(rct_vehicle* vehicle); -static void vehicle_update_space_rings_operating(rct_vehicle* vehicle); -static void vehicle_update_haunted_house_operating(rct_vehicle* vehicle); -static void vehicle_update_crooked_house_operating(rct_vehicle* vehicle); -static void vehicle_update_dodgems_mode(rct_vehicle* vehicle); -static void vehicle_update_swinging(rct_vehicle* vehicle); -static void vehicle_update_simulator_operating(rct_vehicle* vehicle); -static void vehicle_update_top_spin_operating(rct_vehicle* vehicle); -static void vehicle_update_crash(rct_vehicle* vehicle); -static void vehicle_update_travelling_boat(rct_vehicle* vehicle); -static void vehicle_update_motion_boat_hire(rct_vehicle* vehicle); -static void vehicle_update_boat_location(rct_vehicle* vehicle); +static void vehicle_update_showing_film(Vehicle* vehicle); +static void vehicle_update_doing_circus_show(Vehicle* vehicle); +static void vehicle_update_moving_to_end_of_station(Vehicle* vehicle); +static void vehicle_update_waiting_for_passengers(Vehicle* vehicle); +static void vehicle_update_waiting_to_depart(Vehicle* vehicle); +static void vehicle_update_departing(Vehicle* vehicle); +static void vehicle_finish_departing(Vehicle* vehicle); +static void vehicle_update_travelling(Vehicle* vehicle); +static void vehicle_update_ferris_wheel_rotating(Vehicle* vehicle); +static void vehicle_update_rotating(Vehicle* vehicle); +static void vehicle_update_space_rings_operating(Vehicle* vehicle); +static void vehicle_update_haunted_house_operating(Vehicle* vehicle); +static void vehicle_update_crooked_house_operating(Vehicle* vehicle); +static void vehicle_update_dodgems_mode(Vehicle* vehicle); +static void vehicle_update_swinging(Vehicle* vehicle); +static void vehicle_update_simulator_operating(Vehicle* vehicle); +static void vehicle_update_top_spin_operating(Vehicle* vehicle); +static void vehicle_update_crash(Vehicle* vehicle); +static void vehicle_update_travelling_boat(Vehicle* vehicle); +static void vehicle_update_motion_boat_hire(Vehicle* vehicle); +static void vehicle_update_boat_location(Vehicle* vehicle); static bool vehicle_boat_is_location_accessible(const TileCoordsXYZ& location); -static void vehicle_update_arriving(rct_vehicle* vehicle); -static void vehicle_update_unloading_passengers(rct_vehicle* vehicle); -static void vehicle_update_waiting_for_cable_lift(rct_vehicle* vehicle); -static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle); -static void vehicle_update_crash_setup(rct_vehicle* vehicle); -static void vehicle_update_collision_setup(rct_vehicle* vehicle); -static int32_t vehicle_update_motion_dodgems(rct_vehicle* vehicle); -static void vehicle_update_additional_animation(rct_vehicle* vehicle); +static void vehicle_update_arriving(Vehicle* vehicle); +static void vehicle_update_unloading_passengers(Vehicle* vehicle); +static void vehicle_update_waiting_for_cable_lift(Vehicle* vehicle); +static void vehicle_update_travelling_cable_lift(Vehicle* vehicle); +static void vehicle_update_crash_setup(Vehicle* vehicle); +static void vehicle_update_collision_setup(Vehicle* vehicle); +static int32_t vehicle_update_motion_dodgems(Vehicle* vehicle); +static void vehicle_update_additional_animation(Vehicle* vehicle); static bool vehicle_update_motion_collision_detection( - rct_vehicle* vehicle, int16_t x, int16_t y, int16_t z, uint16_t* otherVehicleIndex); -static void vehicle_update_sound(rct_vehicle* vehicle); -static SoundId vehicle_update_scream_sound(rct_vehicle* vehicle); + Vehicle* vehicle, int16_t x, int16_t y, int16_t z, uint16_t* otherVehicleIndex); +static void vehicle_update_sound(Vehicle* vehicle); +static SoundId vehicle_update_scream_sound(Vehicle* vehicle); -static void vehicle_kill_all_passengers(rct_vehicle* vehicle); -static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle); +static void vehicle_kill_all_passengers(Vehicle* vehicle); +static bool vehicle_can_depart_synchronised(Vehicle* vehicle); constexpr int16_t VEHICLE_MAX_SPIN_SPEED = 1536; constexpr int16_t VEHICLE_MIN_SPIN_SPEED = -VEHICLE_MAX_SPIN_SPEED; @@ -93,7 +93,7 @@ constexpr int16_t VEHICLE_MAX_SPIN_SPEED_WATER_RIDE = 512; constexpr int16_t VEHICLE_MIN_SPIN_SPEED_WATER_RIDE = -VEHICLE_MAX_SPIN_SPEED_WATER_RIDE; constexpr int16_t VEHICLE_STOPPING_SPIN_SPEED = 600; -rct_vehicle* gCurrentVehicle; +Vehicle* gCurrentVehicle; static uint8_t _vehicleBreakdown; uint8_t _vehicleStationIndex; @@ -104,7 +104,7 @@ int32_t _vehicleUnkF64E10; uint8_t _vehicleVAngleEndF64E36; uint8_t _vehicleBankEndF64E37; uint8_t _vehicleF64E2C; -rct_vehicle* _vehicleFrontVehicle; +Vehicle* _vehicleFrontVehicle; CoordsXYZ unk_F64E20; // clang-format off @@ -832,7 +832,7 @@ uint16_t vehicle_get_move_info_size(int32_t trackSubposition, int32_t typeAndDir return gTrackVehicleInfo[trackSubposition][typeAndDirection]->size; } -rct_vehicle* try_get_vehicle(uint16_t spriteIndex) +Vehicle* try_get_vehicle(uint16_t spriteIndex) { rct_sprite* sprite = try_get_sprite(spriteIndex); if (sprite == nullptr) @@ -842,16 +842,16 @@ rct_vehicle* try_get_vehicle(uint16_t spriteIndex) return &sprite->vehicle; } -void rct_vehicle::Invalidate() +void Vehicle::Invalidate() { invalidate_sprite_2((rct_sprite*)this); } -static int32_t get_train_mass(const rct_vehicle* first_vehicle) +static int32_t get_train_mass(const Vehicle* first_vehicle) { int32_t totalMass = 0; - for (const rct_vehicle* vehicle = first_vehicle; vehicle != nullptr;) + for (const Vehicle* vehicle = first_vehicle; vehicle != nullptr;) { totalMass += vehicle->mass; @@ -864,7 +864,7 @@ static int32_t get_train_mass(const rct_vehicle* first_vehicle) return totalMass; } -bool rct_vehicle::SoundCanPlay() const +bool Vehicle::SoundCanPlay() const { if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) return false; @@ -914,7 +914,7 @@ bool rct_vehicle::SoundCanPlay() const * * rct2: 0x006BC2F3 */ -uint16_t rct_vehicle::GetSoundPriority() const +uint16_t Vehicle::GetSoundPriority() const { int32_t trainMass = get_train_mass(this); int32_t result = trainMass + (std::abs(velocity) >> 13); @@ -934,7 +934,7 @@ uint16_t rct_vehicle::GetSoundPriority() const return result + 300; } -rct_vehicle_sound_params rct_vehicle::CreateSoundParam(uint16_t priority) const +rct_vehicle_sound_params Vehicle::CreateSoundParam(uint16_t priority) const { rct_vehicle_sound_params param; param.priority = priority; @@ -999,7 +999,7 @@ rct_vehicle_sound_params rct_vehicle::CreateSoundParam(uint16_t priority) const * * rct2: 0x006BB9FF */ -void rct_vehicle::UpdateSoundParams() const +void Vehicle::UpdateSoundParams() const { if (!SoundCanPlay()) return; @@ -1133,7 +1133,7 @@ static rct_vehicle_sound* vehicle_sounds_update_get_vehicle_sound(rct_vehicle_so // Track Noises static void vehicle_sounds_update_sound_1( - rct_vehicle* vehicle, rct_vehicle_sound_params* sound_params, rct_vehicle_sound* sound, uint8_t panVol) + Vehicle* vehicle, rct_vehicle_sound_params* sound_params, rct_vehicle_sound* sound, uint8_t panVol) { int32_t volume = vehicle->sound1_volume; volume *= panVol; @@ -1197,7 +1197,7 @@ static void vehicle_sounds_update_sound_1( // Other noises (e.g. Screams) static void vehicle_sounds_update_sound_2( - rct_vehicle* vehicle, rct_vehicle_sound_params* sound_params, rct_vehicle_sound* sound, uint8_t panVol) + Vehicle* vehicle, rct_vehicle_sound_params* sound_params, rct_vehicle_sound* sound, uint8_t panVol) { int32_t volume = vehicle->sound2_volume; volume *= panVol; @@ -1338,7 +1338,7 @@ void vehicle_sounds_update() vehicleSound->volume = tempvolume; panVol = std::max(0, panVol - tempvolume); - rct_vehicle* vehicle = GET_VEHICLE(vehicleSoundParams->id); + Vehicle* vehicle = GET_VEHICLE(vehicleSoundParams->id); vehicle_sounds_update_sound_1(vehicle, vehicleSoundParams, vehicleSound, panVol); vehicle_sounds_update_sound_2(vehicle, vehicleSoundParams, vehicleSound, panVol); } @@ -1351,7 +1351,7 @@ void vehicle_sounds_update() void vehicle_update_all() { uint16_t sprite_index; - rct_vehicle* vehicle; + Vehicle* vehicle; if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) return; @@ -1374,7 +1374,7 @@ void vehicle_update_all() * rct2: 0x006D6956 * @returns true when all closed */ -static bool vehicle_close_restraints(rct_vehicle* vehicle) +static bool vehicle_close_restraints(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -1401,7 +1401,7 @@ static bool vehicle_close_restraints(rct_vehicle* vehicle) ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING; - rct_vehicle* broken_vehicle = GET_VEHICLE(ride->vehicles[ride->broken_vehicle]); + Vehicle* broken_vehicle = GET_VEHICLE(ride->vehicles[ride->broken_vehicle]); ride->inspection_station = broken_vehicle->current_station; ride->breakdown_reason = ride->breakdown_reason_pending; @@ -1427,7 +1427,7 @@ static bool vehicle_close_restraints(rct_vehicle* vehicle) * rct2: 0x006D6A2C * @returns true when all open */ -static bool vehicle_open_restraints(rct_vehicle* vehicle) +static bool vehicle_open_restraints(Vehicle* vehicle) { int32_t restraintsOpen = true; uint16_t vehicle_id = vehicle->sprite_index; @@ -1511,7 +1511,7 @@ static bool vehicle_open_restraints(rct_vehicle* vehicle) ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING; - rct_vehicle* broken_vehicle = GET_VEHICLE(ride->vehicles[ride->broken_vehicle]); + Vehicle* broken_vehicle = GET_VEHICLE(ride->vehicles[ride->broken_vehicle]); ride->inspection_station = broken_vehicle->current_station; ride->breakdown_reason = ride->breakdown_reason_pending; @@ -1537,7 +1537,7 @@ static bool vehicle_open_restraints(rct_vehicle* vehicle) * * rct2: 0x006D6D1F */ -static void vehicle_update_measurements(rct_vehicle* vehicle) +static void vehicle_update_measurements(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -1955,7 +1955,7 @@ static SoundIdVolume sub_6D7AC0(SoundId currentSoundId, uint8_t currentVolume, S * * rct2: 0x006D77F2 */ -static void vehicle_update(rct_vehicle* vehicle) +static void vehicle_update(Vehicle* vehicle) { // The cable lift uses the ride type of NULL if (vehicle->ride_subtype == RIDE_TYPE_NULL) @@ -2069,7 +2069,7 @@ static void vehicle_update(rct_vehicle* vehicle) * * rct2: 0x006D7BCC */ -static void vehicle_update_moving_to_end_of_station(rct_vehicle* vehicle) +static void vehicle_update_moving_to_end_of_station(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -2179,7 +2179,7 @@ static void vehicle_update_moving_to_end_of_station(rct_vehicle* vehicle) * * rct2: 0x006D7FB4 */ -static void train_ready_to_depart(rct_vehicle* vehicle, uint8_t num_peeps_on_train, uint8_t num_used_seats) +static void train_ready_to_depart(Vehicle* vehicle, uint8_t num_peeps_on_train, uint8_t num_used_seats) { if (num_peeps_on_train != num_used_seats) return; @@ -2256,7 +2256,7 @@ static std::optional ride_get_train_index_from_vehicle(Ride* ride, uin * * rct2: 0x006D7DA1 */ -static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle) +static void vehicle_update_waiting_for_passengers(Vehicle* vehicle) { vehicle->velocity = 0; @@ -2304,7 +2304,7 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle) for (uint16_t sprite_id = vehicle->sprite_index; sprite_id != SPRITE_INDEX_NULL;) { - rct_vehicle* train_vehicle = GET_VEHICLE(sprite_id); + Vehicle* train_vehicle = GET_VEHICLE(sprite_id); num_peeps_on_train += train_vehicle->num_peeps; num_used_seats_on_train += train_vehicle->next_free_seat; @@ -2363,7 +2363,7 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle) if (train_id == vehicle->sprite_index) continue; - rct_vehicle* train = GET_VEHICLE(train_id); + Vehicle* train = GET_VEHICLE(train_id); if (train->status == VEHICLE_STATUS_UNLOADING_PASSENGERS || train->status == VEHICLE_STATUS_MOVING_TO_END_OF_STATION) @@ -2428,7 +2428,7 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle) * * rct2: 0x006D91BF */ -static void vehicle_update_dodgems_mode(rct_vehicle* vehicle) +static void vehicle_update_dodgems_mode(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -2471,7 +2471,7 @@ static void vehicle_update_dodgems_mode(rct_vehicle* vehicle) * * rct2: 0x006D80BE */ -static void vehicle_update_waiting_to_depart(rct_vehicle* vehicle) +static void vehicle_update_waiting_to_depart(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -2518,7 +2518,7 @@ static void vehicle_update_waiting_to_depart(rct_vehicle* vehicle) else { uint16_t spriteId = vehicle->sprite_index; - for (rct_vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train) + for (Vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train) { curVehicle = GET_VEHICLE(spriteId); @@ -2766,7 +2766,7 @@ static bool try_add_synchronised_station(int32_t x, int32_t y, int32_t z) continue; } - rct_vehicle* vehicle = GET_VEHICLE(spriteIndex); + Vehicle* vehicle = GET_VEHICLE(spriteIndex); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART) { continue; @@ -2805,7 +2805,7 @@ static bool try_add_synchronised_station(int32_t x, int32_t y, int32_t z) * The vehicle flag VEHICLE_UPDATE_FLAG_WAIT_ON_ADJACENT is cleared for those * vehicles that depart in sync with the vehicle in the param. */ -static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle) +static bool vehicle_can_depart_synchronised(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -2912,7 +2912,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle) { for (int32_t i = 0; i < ride->num_vehicles; i++) { - rct_vehicle* v = GET_VEHICLE(ride->vehicles[i]); + Vehicle* v = GET_VEHICLE(ride->vehicles[i]); if (v->status != VEHICLE_STATUS_WAITING_TO_DEPART && v->velocity != 0) { // Here at least one vehicle on the ride is moving. @@ -2950,7 +2950,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle) uint16_t spriteIndex = sv_ride->vehicles[i]; if (spriteIndex != SPRITE_INDEX_NULL) { - rct_vehicle* otherVehicle = GET_VEHICLE(spriteIndex); + Vehicle* otherVehicle = GET_VEHICLE(spriteIndex); if (otherVehicle->status != VEHICLE_STATUS_TRAVELLING) { if (currentStation == otherVehicle->current_station) @@ -2996,7 +2996,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle) { if (sv->vehicle_id != SPRITE_INDEX_NULL) { - rct_vehicle* v = GET_VEHICLE(sv->vehicle_id); + Vehicle* v = GET_VEHICLE(sv->vehicle_id); v->update_flags &= ~VEHICLE_UPDATE_FLAG_WAIT_ON_ADJACENT; } } @@ -3008,7 +3008,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle) * * rct2: 0x006D9EB0 */ -void vehicle_peep_easteregg_here_we_are(const rct_vehicle* vehicle) +void vehicle_peep_easteregg_here_we_are(const Vehicle* vehicle) { uint16_t spriteId = vehicle->sprite_index; do @@ -3029,7 +3029,7 @@ void vehicle_peep_easteregg_here_we_are(const rct_vehicle* vehicle) * Performed when vehicle has completed a full circuit * rct2: 0x006D7338 */ -void vehicle_update_test_finish(rct_vehicle* vehicle) +void vehicle_update_test_finish(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -3069,7 +3069,7 @@ void vehicle_update_test_finish(rct_vehicle* vehicle) * * rct2: 0x006D6BE7 */ -void vehicle_test_reset(rct_vehicle* vehicle) +void vehicle_test_reset(Vehicle* vehicle) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_TESTING; @@ -3112,7 +3112,7 @@ void vehicle_test_reset(rct_vehicle* vehicle) window_invalidate_by_number(WC_RIDE, vehicle->ride); } -static bool vehicle_current_tower_element_is_top(rct_vehicle* vehicle) +static bool vehicle_current_tower_element_is_top(Vehicle* vehicle) { TileElement* tileElement = map_get_track_element_at_of_type( { vehicle->track_x, vehicle->track_y, vehicle->track_z }, vehicle->track_type >> 2); @@ -3135,7 +3135,7 @@ static bool vehicle_current_tower_element_is_top(rct_vehicle* vehicle) * * rct2: 0x006D986C */ -static void vehicle_update_travelling_boat_hire_setup(rct_vehicle* vehicle) +static void vehicle_update_travelling_boat_hire_setup(Vehicle* vehicle) { vehicle->var_34 = vehicle->sprite_direction; vehicle->track_x = vehicle->x & 0xFFE0; @@ -3157,7 +3157,7 @@ static void vehicle_update_travelling_boat_hire_setup(rct_vehicle* vehicle) * * rct2: 0x006D982F */ -static void vehicle_update_departing_boat_hire(rct_vehicle* vehicle) +static void vehicle_update_departing_boat_hire(Vehicle* vehicle) { vehicle->lost_time_out = 0; @@ -3176,7 +3176,7 @@ static void vehicle_update_departing_boat_hire(rct_vehicle* vehicle) * * rct2: 0x006D845B */ -static void vehicle_update_departing(rct_vehicle* vehicle) +static void vehicle_update_departing(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -3413,7 +3413,7 @@ static void vehicle_update_departing(rct_vehicle* vehicle) * boosters do not affect the ride. * rct2: 0x006D8858 */ -static void vehicle_finish_departing(rct_vehicle* vehicle) +static void vehicle_finish_departing(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -3458,7 +3458,7 @@ static void vehicle_finish_departing(rct_vehicle* vehicle) * * rct2: 0x006DE5CB */ -static void vehicle_check_if_missing(rct_vehicle* vehicle) +static void vehicle_check_if_missing(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -3499,7 +3499,7 @@ static void vehicle_check_if_missing(rct_vehicle* vehicle) news_item_add_to_queue(NEWS_ITEM_RIDE, STR_NEWS_VEHICLE_HAS_STALLED, vehicle->ride); } -static void vehicle_simulate_crash(rct_vehicle* vehicle) +static void vehicle_simulate_crash(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride != nullptr) @@ -3514,7 +3514,7 @@ static void vehicle_simulate_crash(rct_vehicle* vehicle) * * rct2: 0x006DA059 */ -static void vehicle_update_collision_setup(rct_vehicle* vehicle) +static void vehicle_update_collision_setup(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -3551,9 +3551,9 @@ static void vehicle_update_collision_setup(rct_vehicle* vehicle) ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST; vehicle_kill_all_passengers(vehicle); - rct_vehicle* lastVehicle = vehicle; + Vehicle* lastVehicle = vehicle; uint16_t spriteId = vehicle->sprite_index; - for (rct_vehicle* train; spriteId != SPRITE_INDEX_NULL; spriteId = train->next_vehicle_on_train) + for (Vehicle* train; spriteId != SPRITE_INDEX_NULL; spriteId = train->next_vehicle_on_train) { train = GET_VEHICLE(spriteId); lastVehicle = train; @@ -3599,7 +3599,7 @@ static constexpr const LocationXY16 stru_9A3AC4[] = { * * rct2: 0x006D9EFE */ -static void vehicle_update_crash_setup(rct_vehicle* vehicle) +static void vehicle_update_crash_setup(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride != nullptr && ride->status == RIDE_STATUS_SIMULATING) @@ -3617,9 +3617,9 @@ static void vehicle_update_crash_setup(rct_vehicle* vehicle) int32_t edx = vehicle->velocity >> 10; - rct_vehicle* lastVehicle = vehicle; + Vehicle* lastVehicle = vehicle; uint16_t spriteId = vehicle->sprite_index; - for (rct_vehicle* trainVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = trainVehicle->next_vehicle_on_train) + for (Vehicle* trainVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = trainVehicle->next_vehicle_on_train) { trainVehicle = GET_VEHICLE(spriteId); lastVehicle = trainVehicle; @@ -3662,7 +3662,7 @@ static void vehicle_update_crash_setup(rct_vehicle* vehicle) * * rct2: 0x006D8937 */ -static void vehicle_update_travelling(rct_vehicle* vehicle) +static void vehicle_update_travelling(Vehicle* vehicle) { vehicle_check_if_missing(vehicle); @@ -3840,7 +3840,7 @@ static void vehicle_update_travelling(rct_vehicle* vehicle) * * rct2: 0x006D8C36 */ -static void vehicle_update_arriving(rct_vehicle* vehicle) +static void vehicle_update_arriving(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -4050,7 +4050,7 @@ loc_6D8E36: * * rct2: 0x006D9002 */ -static void vehicle_update_unloading_passengers(rct_vehicle* vehicle) +static void vehicle_update_unloading_passengers(Vehicle* vehicle) { if (vehicle->sub_state == 0) { @@ -4101,7 +4101,7 @@ static void vehicle_update_unloading_passengers(rct_vehicle* vehicle) } uint16_t spriteId = vehicle->sprite_index; - for (rct_vehicle* train; spriteId != SPRITE_INDEX_NULL; spriteId = train->next_vehicle_on_train) + for (Vehicle* train; spriteId != SPRITE_INDEX_NULL; spriteId = train->next_vehicle_on_train) { train = GET_VEHICLE(spriteId); if (train->restraints_position != 255) @@ -4124,7 +4124,7 @@ static void vehicle_update_unloading_passengers(rct_vehicle* vehicle) return; uint16_t spriteId = vehicle->sprite_index; - for (rct_vehicle* train; spriteId != SPRITE_INDEX_NULL; spriteId = train->next_vehicle_on_train) + for (Vehicle* train; spriteId != SPRITE_INDEX_NULL; spriteId = train->next_vehicle_on_train) { train = GET_VEHICLE(spriteId); if (train->num_peeps != train->next_free_seat) @@ -4143,13 +4143,13 @@ static void vehicle_update_unloading_passengers(rct_vehicle* vehicle) * * rct2: 0x006D9CE9 */ -static void vehicle_update_waiting_for_cable_lift(rct_vehicle* vehicle) +static void vehicle_update_waiting_for_cable_lift(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) return; - rct_vehicle* cableLift = GET_VEHICLE(ride->cable_lift); + Vehicle* cableLift = GET_VEHICLE(ride->cable_lift); if (cableLift->status != VEHICLE_STATUS_WAITING_FOR_PASSENGERS) return; @@ -4162,7 +4162,7 @@ static void vehicle_update_waiting_for_cable_lift(rct_vehicle* vehicle) * * rct2: 0x006D9D21 */ -static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle) +static void vehicle_update_travelling_cable_lift(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -4250,13 +4250,13 @@ static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle) * * rct2: 0x006D9820 */ -static void vehicle_update_travelling_boat(rct_vehicle* vehicle) +static void vehicle_update_travelling_boat(Vehicle* vehicle) { vehicle_check_if_missing(vehicle); vehicle_update_motion_boat_hire(vehicle); } -static void loc_6DA9F9(rct_vehicle* vehicle, int32_t x, int32_t y, int32_t bx, int32_t dx) +static void loc_6DA9F9(Vehicle* vehicle, int32_t x, int32_t y, int32_t bx, int32_t dx) { vehicle->remaining_distance = 0; if (!vehicle_update_motion_collision_detection(vehicle, x, y, vehicle->z, nullptr)) @@ -4283,7 +4283,7 @@ static void loc_6DA9F9(rct_vehicle* vehicle, int32_t x, int32_t y, int32_t bx, i * * rct2: 0x006DA717 */ -static void vehicle_update_motion_boat_hire(rct_vehicle* vehicle) +static void vehicle_update_motion_boat_hire(Vehicle* vehicle) { _vehicleMotionTrackFlags = 0; vehicle->velocity += vehicle->acceleration; @@ -4575,7 +4575,7 @@ static void vehicle_update_motion_boat_hire(rct_vehicle* vehicle) * * rct2: 0x006DA280 */ -static void vehicle_update_boat_location(rct_vehicle* vehicle) +static void vehicle_update_boat_location(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -4680,7 +4680,7 @@ static bool vehicle_boat_is_location_accessible(const TileCoordsXYZ& location) * * rct2: 0x006D9249 */ -static void vehicle_update_swinging(rct_vehicle* vehicle) +static void vehicle_update_swinging(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -4754,7 +4754,7 @@ static void vehicle_update_swinging(rct_vehicle* vehicle) * * rct2: 0x006D9413 */ -static void vehicle_update_ferris_wheel_rotating(rct_vehicle* vehicle) +static void vehicle_update_ferris_wheel_rotating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -4846,7 +4846,7 @@ static void vehicle_update_ferris_wheel_rotating(rct_vehicle* vehicle) * * rct2: 0x006D94F2 */ -static void vehicle_update_simulator_operating(rct_vehicle* vehicle) +static void vehicle_update_simulator_operating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -4872,7 +4872,7 @@ static void vehicle_update_simulator_operating(rct_vehicle* vehicle) * * rct2: 0x006D92FF */ -static void vehicle_update_rotating(rct_vehicle* vehicle) +static void vehicle_update_rotating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -4963,7 +4963,7 @@ static void vehicle_update_rotating(rct_vehicle* vehicle) * * rct2: 0x006D97CB */ -static void vehicle_update_space_rings_operating(rct_vehicle* vehicle) +static void vehicle_update_space_rings_operating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -4989,7 +4989,7 @@ static void vehicle_update_space_rings_operating(rct_vehicle* vehicle) * * rct2: 0x006D9641 */ -static void vehicle_update_haunted_house_operating(rct_vehicle* vehicle) +static void vehicle_update_haunted_house_operating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -5043,7 +5043,7 @@ static void vehicle_update_haunted_house_operating(rct_vehicle* vehicle) * * rct2: 0x006d9781 */ -static void vehicle_update_crooked_house_operating(rct_vehicle* vehicle) +static void vehicle_update_crooked_house_operating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -5063,7 +5063,7 @@ static void vehicle_update_crooked_house_operating(rct_vehicle* vehicle) * * rct2: 0x006D9547 */ -static void vehicle_update_top_spin_operating(rct_vehicle* vehicle) +static void vehicle_update_top_spin_operating(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -5095,7 +5095,7 @@ static void vehicle_update_top_spin_operating(rct_vehicle* vehicle) * * rct2: 0x006D95AD */ -static void vehicle_update_showing_film(rct_vehicle* vehicle) +static void vehicle_update_showing_film(Vehicle* vehicle) { int32_t currentTime, totalTime; @@ -5119,7 +5119,7 @@ static void vehicle_update_showing_film(rct_vehicle* vehicle) * * rct2: 0x006D95F7 */ -static void vehicle_update_doing_circus_show(rct_vehicle* vehicle) +static void vehicle_update_doing_circus_show(Vehicle* vehicle) { if (_vehicleBreakdown == 0) return; @@ -5182,7 +5182,7 @@ static TileElement* vehicle_check_collision(int16_t x, int16_t y, int16_t z) * * rct2: 0x006DE6C6 */ -static void vehicle_kill_all_passengers(rct_vehicle* vehicle) +static void vehicle_kill_all_passengers(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -5190,7 +5190,7 @@ static void vehicle_kill_all_passengers(rct_vehicle* vehicle) uint16_t numFatalities = 0; uint16_t spriteId = vehicle->sprite_index; - for (rct_vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train) + for (Vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train) { curVehicle = GET_VEHICLE(spriteId); numFatalities += curVehicle->num_peeps; @@ -5215,7 +5215,7 @@ static void vehicle_kill_all_passengers(rct_vehicle* vehicle) } spriteId = vehicle->sprite_index; - for (rct_vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train) + for (Vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train) { curVehicle = GET_VEHICLE(spriteId); @@ -5243,7 +5243,7 @@ static void vehicle_kill_all_passengers(rct_vehicle* vehicle) } } -static void vehicle_crash_on_land(rct_vehicle* vehicle) +static void vehicle_crash_on_land(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -5306,7 +5306,7 @@ static void vehicle_crash_on_land(rct_vehicle* vehicle) vehicle->crash_z = 0; } -static void vehicle_crash_on_water(rct_vehicle* vehicle) +static void vehicle_crash_on_water(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -5374,10 +5374,10 @@ static void vehicle_crash_on_water(rct_vehicle* vehicle) * * rct2: 0x006D98CA */ -static void vehicle_update_crash(rct_vehicle* vehicle) +static void vehicle_update_crash(Vehicle* vehicle) { uint16_t spriteId = vehicle->sprite_index; - rct_vehicle* curVehicle; + Vehicle* curVehicle; do { curVehicle = GET_VEHICLE(spriteId); @@ -5465,7 +5465,7 @@ static void vehicle_update_crash(rct_vehicle* vehicle) * * rct2: 0x006D7888 */ -static void vehicle_update_sound(rct_vehicle* vehicle) +static void vehicle_update_sound(Vehicle* vehicle) { // frictionVolume (bl) should be set before hand uint8_t frictionVolume = 255; @@ -5577,12 +5577,12 @@ static void vehicle_update_sound(rct_vehicle* vehicle) * * rct2: 0x006D796B */ -static SoundId vehicle_update_scream_sound(rct_vehicle* vehicle) +static SoundId vehicle_update_scream_sound(Vehicle* vehicle) { uint32_t r; uint16_t spriteIndex; rct_ride_entry* rideEntry; - rct_vehicle* vehicle2; + Vehicle* vehicle2; rideEntry = get_ride_entry(vehicle->ride_subtype); @@ -5668,7 +5668,7 @@ produceScream: * dx: lateralG * esi: vehicle */ -GForces vehicle_get_g_forces(const rct_vehicle* vehicle) +GForces vehicle_get_g_forces(const Vehicle* vehicle) { int32_t gForceVert = (((int64_t)0x280000) * Unk9A37E4[vehicle->vehicle_sprite_type]) >> 32; gForceVert = (((int64_t)gForceVert) * Unk9A39C4[vehicle->bank_rotation]) >> 32; @@ -6186,7 +6186,7 @@ GForces vehicle_get_g_forces(const rct_vehicle* vehicle) return { (int16_t)(gForceVert & 0xFFFF), (int16_t)(gForceLateral & 0xFFFF) }; } -void vehicle_set_map_toolbar(const rct_vehicle* vehicle) +void vehicle_set_map_toolbar(const Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride != nullptr) @@ -6213,9 +6213,9 @@ void vehicle_set_map_toolbar(const rct_vehicle* vehicle) } } -rct_vehicle* vehicle_get_head(const rct_vehicle* vehicle) +Vehicle* vehicle_get_head(const Vehicle* vehicle) { - rct_vehicle* prevVehicle; + Vehicle* prevVehicle; for (;;) { @@ -6226,10 +6226,10 @@ rct_vehicle* vehicle_get_head(const rct_vehicle* vehicle) vehicle = prevVehicle; } - return const_cast(vehicle); + return const_cast(vehicle); } -rct_vehicle* vehicle_get_tail(const rct_vehicle* vehicle) +Vehicle* vehicle_get_tail(const Vehicle* vehicle) { uint16_t spriteIndex; @@ -6238,10 +6238,10 @@ rct_vehicle* vehicle_get_tail(const rct_vehicle* vehicle) vehicle = GET_VEHICLE(spriteIndex); } - return const_cast(vehicle); + return const_cast(vehicle); } -int32_t vehicle_is_used_in_pairs(const rct_vehicle* vehicle) +int32_t vehicle_is_used_in_pairs(const Vehicle* vehicle) { return vehicle->num_seats & VEHICLE_SEAT_PAIR_FLAG; } @@ -6250,7 +6250,7 @@ int32_t vehicle_is_used_in_pairs(const rct_vehicle* vehicle) * * rct2: 0x006DA44E */ -static int32_t vehicle_update_motion_dodgems(rct_vehicle* vehicle) +static int32_t vehicle_update_motion_dodgems(Vehicle* vehicle) { _vehicleMotionTrackFlags = 0; @@ -6369,7 +6369,7 @@ static int32_t vehicle_update_motion_dodgems(rct_vehicle* vehicle) if (oldVelocity >= 131072) { - rct_vehicle* collideVehicle = GET_VEHICLE(collideSprite); + Vehicle* collideVehicle = GET_VEHICLE(collideSprite); collideVehicle->dodgems_collision_direction = direction; vehicle->dodgems_collision_direction = direction ^ (1 << 4); } @@ -6424,7 +6424,7 @@ static int32_t vehicle_update_motion_dodgems(rct_vehicle* vehicle) * * rct2: 0x006DD365 */ -bool vehicle_update_dodgems_collision(rct_vehicle* vehicle, int16_t x, int16_t y, uint16_t* spriteId) +bool vehicle_update_dodgems_collision(Vehicle* vehicle, int16_t x, int16_t y, uint16_t* spriteId) { uint16_t bp = (vehicle->var_44 * 30) >> 9; uint32_t trackType = vehicle->track_type >> 2; @@ -6451,7 +6451,7 @@ bool vehicle_update_dodgems_collision(rct_vehicle* vehicle, int16_t x, int16_t y uint16_t spriteIdx = sprite_get_first_in_quadrant(location.x * 32, location.y * 32); while (spriteIdx != SPRITE_INDEX_NULL) { - rct_vehicle* vehicle2 = GET_VEHICLE(spriteIdx); + Vehicle* vehicle2 = GET_VEHICLE(spriteIdx); spriteIdx = vehicle2->next_in_quadrant; if (vehicle2 == vehicle) @@ -6490,7 +6490,7 @@ bool vehicle_update_dodgems_collision(rct_vehicle* vehicle, int16_t x, int16_t y * * rct2: 0x006DAB90 */ -static void vehicle_update_track_motion_up_stop_check(rct_vehicle* vehicle) +static void vehicle_update_track_motion_up_stop_check(Vehicle* vehicle) { auto vehicleEntry = vehicle_get_vehicle_entry(vehicle); if (vehicleEntry == nullptr) @@ -6565,7 +6565,7 @@ static void vehicle_update_track_motion_up_stop_check(rct_vehicle* vehicle) * merely as a velocity regulator, in a closed state. When the brake is open, it * boosts the train to the speed limit */ -static void apply_non_stop_block_brake(rct_vehicle* vehicle, bool block_brake_closed) +static void apply_non_stop_block_brake(Vehicle* vehicle, bool block_brake_closed) { if (vehicle->velocity >= 0) { @@ -6589,7 +6589,7 @@ static void apply_non_stop_block_brake(rct_vehicle* vehicle, bool block_brake_cl * * Modifies the train's velocity influenced by a block brake */ -static void apply_block_brakes(rct_vehicle* vehicle, bool is_block_brake_closed) +static void apply_block_brakes(Vehicle* vehicle, bool is_block_brake_closed) { // If the site is in a "train blocking" state if (is_block_brake_closed) @@ -6621,7 +6621,7 @@ static void apply_block_brakes(rct_vehicle* vehicle, bool is_block_brake_closed) * * rct2: 0x006DAC43 */ -static void check_and_apply_block_section_stop_site(rct_vehicle* vehicle) +static void check_and_apply_block_section_stop_site(Vehicle* vehicle) { auto ride = get_ride(vehicle->ride); if (ride == nullptr) @@ -6690,7 +6690,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle* vehicle) * * rct2: 0x006DADAE */ -static void update_velocity(rct_vehicle* vehicle) +static void update_velocity(Vehicle* vehicle) { int32_t nextVelocity = vehicle->acceleration + vehicle->velocity; if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_ZERO_VELOCITY) @@ -6716,7 +6716,7 @@ static void update_velocity(rct_vehicle* vehicle) _vehicleVelocityF64E0C = (nextVelocity >> 10) * 42; } -static void vehicle_update_block_brakes_open_previous_section(rct_vehicle* vehicle, TileElement* tileElement) +static void vehicle_update_block_brakes_open_previous_section(Vehicle* vehicle, TileElement* tileElement) { int32_t x = vehicle->track_x; int32_t y = vehicle->track_y; @@ -6783,7 +6783,7 @@ static void vehicle_update_block_brakes_open_previous_section(rct_vehicle* vehic } } -static int32_t vehicle_get_swing_amount(rct_vehicle* vehicle) +static int32_t vehicle_get_swing_amount(Vehicle* vehicle) { int32_t trackType = vehicle->track_type >> 2; switch (trackType) @@ -6907,7 +6907,7 @@ static int32_t vehicle_get_swing_amount(rct_vehicle* vehicle) * * rct2: 0x006D6776 */ -static void vehicle_update_swinging_car(rct_vehicle* vehicle) +static void vehicle_update_swinging_car(Vehicle* vehicle) { int32_t dword_F64E08 = abs(_vehicleVelocityF64E08); vehicle->var_4E += (-vehicle->swinging_car_var_0) >> 6; @@ -7097,7 +7097,7 @@ static const uint8_t TrackTypeToSpinFunction[256] = { * * rct2: 0x006D661F */ -static void vehicle_update_spinning_car(rct_vehicle* vehicle) +static void vehicle_update_spinning_car(Vehicle* vehicle) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_ROTATION_OFF_WILD_MOUSE) { @@ -7234,7 +7234,7 @@ static void steam_particle_create(int16_t x, int16_t y, int16_t z) * * rct2: 0x006D63D4 */ -static void vehicle_update_additional_animation(rct_vehicle* vehicle) +static void vehicle_update_additional_animation(Vehicle* vehicle) { uint8_t al, ah; uint32_t eax; @@ -7390,7 +7390,7 @@ static void vehicle_update_additional_animation(rct_vehicle* vehicle) * * rct2: 0x006DEDB1 */ -static void vehicle_play_scenery_door_open_sound(rct_vehicle* vehicle, WallElement* tileElement) +static void vehicle_play_scenery_door_open_sound(Vehicle* vehicle, WallElement* tileElement) { rct_scenery_entry* wallEntry = tileElement->GetEntry(); int32_t doorSoundType = wall_entry_get_door_sound(wallEntry); @@ -7408,7 +7408,7 @@ static void vehicle_play_scenery_door_open_sound(rct_vehicle* vehicle, WallEleme * * rct2: 0x006DED7A */ -static void vehicle_play_scenery_door_close_sound(rct_vehicle* vehicle, WallElement* tileElement) +static void vehicle_play_scenery_door_close_sound(Vehicle* vehicle, WallElement* tileElement) { rct_scenery_entry* wallEntry = tileElement->GetEntry(); int32_t doorSoundType = wall_entry_get_door_sound(wallEntry); @@ -7426,7 +7426,7 @@ static void vehicle_play_scenery_door_close_sound(rct_vehicle* vehicle, WallElem * * rct2: 0x006DEE93 */ -static void vehicle_update_scenery_door(rct_vehicle* vehicle) +static void vehicle_update_scenery_door(Vehicle* vehicle) { int32_t trackType = vehicle->track_type >> 2; const rct_preview_track* trackBlock = TrackBlocks[trackType]; @@ -7465,7 +7465,7 @@ static void vehicle_update_scenery_door(rct_vehicle* vehicle) * * rct2: 0x006DB38B */ -static bool loc_6DB38B(rct_vehicle* vehicle, TileElement* tileElement) +static bool loc_6DB38B(Vehicle* vehicle, TileElement* tileElement) { // Get bank int32_t bankStart = track_get_actual_bank_3(vehicle, tileElement); @@ -7477,7 +7477,7 @@ static bool loc_6DB38B(rct_vehicle* vehicle, TileElement* tileElement) return vangleStart == _vehicleVAngleEndF64E36 && bankStart == _vehicleBankEndF64E37; } -static void VehicleUpdateGoKartAttemptSwitchLanes(rct_vehicle* vehicle) +static void VehicleUpdateGoKartAttemptSwitchLanes(Vehicle* vehicle) { uint16_t probability = 0x8000; if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_6) @@ -7499,7 +7499,7 @@ static void VehicleUpdateGoKartAttemptSwitchLanes(rct_vehicle* vehicle) * * rct2: 0x006DB545 */ -static void vehicle_trigger_on_ride_photo(rct_vehicle* vehicle, TileElement* tileElement) +static void vehicle_trigger_on_ride_photo(Vehicle* vehicle, TileElement* tileElement) { tileElement->AsTrack()->SetPhotoTimeout(); @@ -7510,7 +7510,7 @@ static void vehicle_trigger_on_ride_photo(rct_vehicle* vehicle, TileElement* til * * rct2: 0x006DEDE8 */ -static void vehicle_update_handle_scenery_door(rct_vehicle* vehicle) +static void vehicle_update_handle_scenery_door(Vehicle* vehicle) { int32_t trackType = vehicle->track_type >> 2; const rct_preview_track* trackBlock = TrackBlocks[trackType]; @@ -7556,7 +7556,7 @@ static void vehicle_update_play_water_splash_sound() * * rct2: 0x006DB59E */ -static void vehicle_update_handle_water_splash(rct_vehicle* vehicle) +static void vehicle_update_handle_water_splash(Vehicle* vehicle) { rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); int32_t trackType = vehicle->track_type >> 2; @@ -7569,8 +7569,8 @@ static void vehicle_update_handle_water_splash(rct_vehicle* vehicle) { if (track_element_is_covered(trackType)) { - rct_vehicle* nextVehicle = GET_VEHICLE(vehicle->next_vehicle_on_ride); - rct_vehicle* nextNextVehicle = GET_VEHICLE(nextVehicle->next_vehicle_on_ride); + Vehicle* nextVehicle = GET_VEHICLE(vehicle->next_vehicle_on_ride); + Vehicle* nextNextVehicle = GET_VEHICLE(nextVehicle->next_vehicle_on_ride); if (!track_element_is_covered(nextNextVehicle->track_type >> 2)) { if (vehicle->track_progress == 4) @@ -7608,7 +7608,7 @@ static void vehicle_update_handle_water_splash(rct_vehicle* vehicle) * * rct2: 0x006DB807 */ -static void vehicle_update_reverser_car_bogies(rct_vehicle* vehicle) +static void vehicle_update_reverser_car_bogies(Vehicle* vehicle) { const rct_vehicle_info* moveInfo = vehicle_get_move_info( vehicle->TrackSubposition, vehicle->track_type, vehicle->track_progress); @@ -7628,7 +7628,7 @@ static void vehicle_update_reverser_car_bogies(rct_vehicle* vehicle) * @param otherVehicleIndex (bp) */ static bool vehicle_update_motion_collision_detection( - rct_vehicle* vehicle, int16_t x, int16_t y, int16_t z, uint16_t* otherVehicleIndex) + Vehicle* vehicle, int16_t x, int16_t y, int16_t z, uint16_t* otherVehicleIndex) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_1) return false; @@ -7647,7 +7647,7 @@ static bool vehicle_update_motion_collision_detection( if (otherVehicleIndex == nullptr) return false; - rct_vehicle* collideVehicle = GET_VEHICLE(*otherVehicleIndex); + Vehicle* collideVehicle = GET_VEHICLE(*otherVehicleIndex); if (vehicle == collideVehicle) return false; @@ -7678,7 +7678,7 @@ static bool vehicle_update_motion_collision_detection( bool mayCollide = false; uint16_t collideId = SPRITE_INDEX_NULL; - rct_vehicle* collideVehicle = nullptr; + Vehicle* collideVehicle = nullptr; for (auto xy_offset : Unk9A37C4) { location += xy_offset; @@ -7823,10 +7823,10 @@ static bool vehicle_update_motion_collision_detection( * * rct2: 0x006DB7D6 */ -static void vehicle_reverse_reverser_car(rct_vehicle* vehicle) +static void vehicle_reverse_reverser_car(Vehicle* vehicle) { - rct_vehicle* previousVehicle = GET_VEHICLE(vehicle->prev_vehicle_on_ride); - rct_vehicle* nextVehicle = GET_VEHICLE(vehicle->next_vehicle_on_ride); + Vehicle* previousVehicle = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + Vehicle* nextVehicle = GET_VEHICLE(vehicle->next_vehicle_on_ride); vehicle->track_progress = 168; vehicle->vehicle_type ^= 1; @@ -7842,7 +7842,7 @@ static void vehicle_reverse_reverser_car(rct_vehicle* vehicle) * * rct2: 0x006DBF3E */ -static void sub_6DBF3E(rct_vehicle* vehicle) +static void sub_6DBF3E(Vehicle* vehicle) { rct_ride_entry_vehicle* vehicleEntry = vehicle_get_vehicle_entry(vehicle); @@ -7938,7 +7938,7 @@ static void sub_6DBF3E(rct_vehicle* vehicle) * rct2: 0x006DB08C */ static bool vehicle_update_track_motion_forwards_get_new_track( - rct_vehicle* vehicle, uint16_t trackType, Ride* ride, rct_ride_entry* rideEntry) + Vehicle* vehicle, uint16_t trackType, Ride* ride, rct_ride_entry* rideEntry) { registers regs = {}; @@ -8141,7 +8141,7 @@ loc_6DB41D: * rct2: 0x006DAEB9 */ static bool vehicle_update_track_motion_forwards( - rct_vehicle* vehicle, rct_ride_entry_vehicle* vehicleEntry, Ride* ride, rct_ride_entry* rideEntry) + Vehicle* vehicle, rct_ride_entry_vehicle* vehicleEntry, Ride* ride, rct_ride_entry* rideEntry) { registers regs = {}; loc_6DAEB9: @@ -8346,7 +8346,7 @@ loc_6DB967: vehicle->remaining_distance = -1; // Might need to be bp rather than vehicle, but hopefully not - rct_vehicle* head = vehicle_get_head(GET_VEHICLE(regs.bp)); + Vehicle* head = vehicle_get_head(GET_VEHICLE(regs.bp)); regs.eax = abs(vehicle->velocity - head->velocity); if (!(rideEntry->flags & RIDE_ENTRY_FLAG_DISABLE_COLLISION_CRASHES)) @@ -8379,7 +8379,7 @@ loc_6DB967: * rct2: 0x006DBAA6 */ static bool vehicle_update_track_motion_backwards_get_new_track( - rct_vehicle* vehicle, uint16_t trackType, Ride* ride, uint16_t* progress) + Vehicle* vehicle, uint16_t trackType, Ride* ride, uint16_t* progress) { _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_start; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_start; @@ -8546,7 +8546,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track( * rct2: 0x006DBA33 */ static bool vehicle_update_track_motion_backwards( - rct_vehicle* vehicle, rct_ride_entry_vehicle* vehicleEntry, Ride* ride, rct_ride_entry* rideEntry) + Vehicle* vehicle, rct_ride_entry_vehicle* vehicleEntry, Ride* ride, rct_ride_entry* rideEntry) { registers regs = {}; @@ -8666,8 +8666,8 @@ loc_6DBE7F: _vehicleVelocityF64E0C -= vehicle->remaining_distance - 0x368A; vehicle->remaining_distance = 0x368A; - rct_vehicle* v3 = GET_VEHICLE(regs.bp); - rct_vehicle* v4 = gCurrentVehicle; + Vehicle* v3 = GET_VEHICLE(regs.bp); + Vehicle* v4 = gCurrentVehicle; if (!(rideEntry->flags & RIDE_ENTRY_FLAG_DISABLE_COLLISION_CRASHES)) { @@ -8701,7 +8701,7 @@ loc_6DBE7F: * * */ -static int32_t vehicle_update_track_motion_mini_golf(rct_vehicle* vehicle, int32_t* outStation) +static int32_t vehicle_update_track_motion_mini_golf(Vehicle* vehicle, int32_t* outStation) { registers regs = {}; @@ -8767,7 +8767,7 @@ loc_6DC476: if (vehicle->mini_golf_flags & (1 << 0)) { regs.di = vehicle->IsHead() ? vehicle->next_vehicle_on_ride : vehicle->prev_vehicle_on_ride; - rct_vehicle* vEDI = GET_VEHICLE(regs.di); + Vehicle* vEDI = GET_VEHICLE(regs.di); if (!(vEDI->mini_golf_flags & (1 << 0)) || (vEDI->mini_golf_flags & (1 << 2))) { goto loc_6DC985; @@ -8783,7 +8783,7 @@ loc_6DC476: if (vehicle->mini_golf_flags & (1 << 1)) { regs.di = vehicle->IsHead() ? vehicle->next_vehicle_on_ride : vehicle->prev_vehicle_on_ride; - rct_vehicle* vEDI = GET_VEHICLE(regs.di); + Vehicle* vEDI = GET_VEHICLE(regs.di); if (!(vEDI->mini_golf_flags & (1 << 1)) || (vEDI->mini_golf_flags & (1 << 2))) { goto loc_6DC985; @@ -8798,7 +8798,7 @@ loc_6DC476: if (vehicle->mini_golf_flags & (1 << 3)) { - rct_vehicle* vEDI = vehicle; + Vehicle* vEDI = vehicle; for (;;) { @@ -8890,7 +8890,7 @@ loc_6DC476: if (!vehicle->IsHead()) { - rct_vehicle* prevVehicle = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + Vehicle* prevVehicle = GET_VEHICLE(vehicle->prev_vehicle_on_ride); regs.al = prevVehicle->TrackSubposition; if (regs.al != VEHICLE_TRACK_SUBPOSITION_MINI_GOLF_START_9) { @@ -9233,8 +9233,8 @@ loc_6DCD6B: _vehicleVelocityF64E0C -= vehicle->remaining_distance - 0x368A; vehicle->remaining_distance = 0x368A; { - rct_vehicle* vEBP = GET_VEHICLE(regs.bp); - rct_vehicle* vEDI = gCurrentVehicle; + Vehicle* vEBP = GET_VEHICLE(regs.bp); + Vehicle* vEDI = gCurrentVehicle; regs.eax = abs(vEDI->velocity - vEBP->velocity); if (regs.eax > 0xE0000) { @@ -9451,7 +9451,7 @@ loc_6DD069: * rct2: 0x006DC1E4 */ static void vehicle_update_track_motion_powered_ride_acceleration( - rct_vehicle* vehicle, rct_ride_entry_vehicle* vehicleEntry, uint32_t totalMass, int32_t* acceleration) + Vehicle* vehicle, rct_ride_entry_vehicle* vehicleEntry, uint32_t totalMass, int32_t* acceleration) { if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY) { @@ -9567,7 +9567,7 @@ static void vehicle_update_track_motion_powered_ride_acceleration( * * rct2: 0x006DAB4C */ -int32_t vehicle_update_track_motion(rct_vehicle* vehicle, int32_t* outStation) +int32_t vehicle_update_track_motion(Vehicle* vehicle, int32_t* outStation) { registers regs = {}; @@ -9608,7 +9608,7 @@ int32_t vehicle_update_track_motion(rct_vehicle* vehicle, int32_t* outStation) uint16_t spriteId = vehicle->sprite_index; while (spriteId != SPRITE_INDEX_NULL) { - rct_vehicle* car = GET_VEHICLE(spriteId); + Vehicle* car = GET_VEHICLE(spriteId); vehicleEntry = vehicle_get_vehicle_entry(car); if (vehicleEntry == nullptr) { @@ -9824,7 +9824,7 @@ int32_t vehicle_update_track_motion(rct_vehicle* vehicle, int32_t* outStation) return regs.eax; } -rct_ride_entry_vehicle* vehicle_get_vehicle_entry(const rct_vehicle* vehicle) +rct_ride_entry_vehicle* vehicle_get_vehicle_entry(const Vehicle* vehicle) { rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); if (rideEntry == nullptr) @@ -9834,7 +9834,7 @@ rct_ride_entry_vehicle* vehicle_get_vehicle_entry(const rct_vehicle* vehicle) return &rideEntry->vehicles[vehicle->vehicle_type]; } -int32_t vehicle_get_total_num_peeps(const rct_vehicle* vehicle) +int32_t vehicle_get_total_num_peeps(const Vehicle* vehicle) { uint16_t spriteIndex; int32_t numPeeps = 0; @@ -9855,22 +9855,22 @@ int32_t vehicle_get_total_num_peeps(const rct_vehicle* vehicle) * * rct2: 0x006DA1EC */ -void vehicle_invalidate_window(rct_vehicle* vehicle) +void vehicle_invalidate_window(Vehicle* vehicle) { auto intent = Intent(INTENT_ACTION_INVALIDATE_VEHICLE_WINDOW); intent.putExtra(INTENT_EXTRA_VEHICLE, vehicle); context_broadcast_intent(&intent); } -void vehicle_update_crossings(const rct_vehicle* vehicle) +void vehicle_update_crossings(const Vehicle* vehicle) { if (vehicle_get_head(vehicle) != vehicle) { return; } - const rct_vehicle* frontVehicle{}; - const rct_vehicle* backVehicle{}; + const Vehicle* frontVehicle{}; + const Vehicle* backVehicle{}; bool travellingForwards = !(vehicle->update_flags & VEHICLE_UPDATE_FLAG_REVERSING_SHUTTLE); @@ -9994,7 +9994,7 @@ void vehicle_update_crossings(const rct_vehicle* vehicle) } } -void vehicle_claxon(const rct_vehicle* vehicle) +void vehicle_claxon(const Vehicle* vehicle) { rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); switch (rideEntry->vehicles[vehicle->vehicle_type].sound_range) @@ -10008,7 +10008,7 @@ void vehicle_claxon(const rct_vehicle* vehicle) } } -rct_vehicle* rct_vehicle::GetHead() +Vehicle* Vehicle::GetHead() { auto v = this; while (v != nullptr && !v->IsHead()) @@ -10018,12 +10018,12 @@ rct_vehicle* rct_vehicle::GetHead() return v; } -const rct_vehicle* rct_vehicle::GetHead() const +const Vehicle* Vehicle::GetHead() const { - return ((rct_vehicle*)this)->GetHead(); + return ((Vehicle*)this)->GetHead(); } -const rct_vehicle* rct_vehicle::GetCar(size_t carIndex) const +const Vehicle* Vehicle::GetCar(size_t carIndex) const { auto car = this; for (; carIndex != 0; carIndex--) @@ -10033,14 +10033,14 @@ const rct_vehicle* rct_vehicle::GetCar(size_t carIndex) const return car; } -void rct_vehicle::SetState(VEHICLE_STATUS vehicleStatus, uint8_t subState) +void Vehicle::SetState(VEHICLE_STATUS vehicleStatus, uint8_t subState) { status = vehicleStatus; sub_state = subState; vehicle_invalidate_window(this); } -bool rct_vehicle::IsGhost() const +bool Vehicle::IsGhost() const { auto r = get_ride(ride); return r != nullptr && r->status == RIDE_STATUS_SIMULATING; diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 3a0fddcc65..05452d0233 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -174,7 +174,7 @@ enum VEHICLE_TRACK_SUBPOSITION : uint8_t VEHICLE_TRACK_SUBPOSITION_REVERSER_RC_REAR_BOGIE, }; -struct rct_vehicle : SpriteBase +struct Vehicle : SpriteBase { uint8_t vehicle_sprite_type; // 0x1F uint8_t bank_rotation; // 0x20 @@ -294,9 +294,9 @@ struct rct_vehicle : SpriteBase { return type == VEHICLE_TYPE_HEAD; } - rct_vehicle* GetHead(); - const rct_vehicle* GetHead() const; - const rct_vehicle* GetCar(size_t carIndex) const; + Vehicle* GetHead(); + const Vehicle* GetHead() const; + const Vehicle* GetCar(size_t carIndex) const; void Invalidate(); void SetState(VEHICLE_STATUS vehicleStatus, uint8_t subState = 0); bool IsGhost() const; @@ -310,8 +310,8 @@ private: struct train_ref { - rct_vehicle* head; - rct_vehicle* tail; + Vehicle* head; + Vehicle* tail; }; // Size: 0x09 @@ -498,26 +498,26 @@ struct GForces int32_t LateralG{}; }; -rct_vehicle* try_get_vehicle(uint16_t spriteIndex); +Vehicle* try_get_vehicle(uint16_t spriteIndex); void vehicle_update_all(); void vehicle_sounds_update(); -GForces vehicle_get_g_forces(const rct_vehicle* vehicle); -void vehicle_set_map_toolbar(const rct_vehicle* vehicle); -int32_t vehicle_is_used_in_pairs(const rct_vehicle* vehicle); -int32_t vehicle_update_track_motion(rct_vehicle* vehicle, int32_t* outStation); -rct_ride_entry_vehicle* vehicle_get_vehicle_entry(const rct_vehicle* vehicle); -int32_t vehicle_get_total_num_peeps(const rct_vehicle* vehicle); -void vehicle_invalidate_window(rct_vehicle* vehicle); -void vehicle_update_test_finish(rct_vehicle* vehicle); -void vehicle_test_reset(rct_vehicle* vehicle); -void vehicle_peep_easteregg_here_we_are(const rct_vehicle* vehicle); -rct_vehicle* vehicle_get_head(const rct_vehicle* vehicle); -rct_vehicle* vehicle_get_tail(const rct_vehicle* vehicle); +GForces vehicle_get_g_forces(const Vehicle* vehicle); +void vehicle_set_map_toolbar(const Vehicle* vehicle); +int32_t vehicle_is_used_in_pairs(const Vehicle* vehicle); +int32_t vehicle_update_track_motion(Vehicle* vehicle, int32_t* outStation); +rct_ride_entry_vehicle* vehicle_get_vehicle_entry(const Vehicle* vehicle); +int32_t vehicle_get_total_num_peeps(const Vehicle* vehicle); +void vehicle_invalidate_window(Vehicle* vehicle); +void vehicle_update_test_finish(Vehicle* vehicle); +void vehicle_test_reset(Vehicle* vehicle); +void vehicle_peep_easteregg_here_we_are(const Vehicle* vehicle); +Vehicle* vehicle_get_head(const Vehicle* vehicle); +Vehicle* vehicle_get_tail(const Vehicle* vehicle); const rct_vehicle_info* vehicle_get_move_info(int32_t trackSubposition, int32_t typeAndDirection, int32_t offset); uint16_t vehicle_get_move_info_size(int32_t trackSubposition, int32_t typeAndDirection); -bool vehicle_update_dodgems_collision(rct_vehicle* vehicle, int16_t x, int16_t y, uint16_t* spriteId); +bool vehicle_update_dodgems_collision(Vehicle* vehicle, int16_t x, int16_t y, uint16_t* spriteId); -extern rct_vehicle* gCurrentVehicle; +extern Vehicle* gCurrentVehicle; extern uint8_t _vehicleStationIndex; extern uint32_t _vehicleMotionTrackFlags; extern int32_t _vehicleVelocityF64E08; @@ -526,7 +526,7 @@ extern int32_t _vehicleUnkF64E10; extern uint8_t _vehicleVAngleEndF64E36; extern uint8_t _vehicleBankEndF64E37; extern uint8_t _vehicleF64E2C; -extern rct_vehicle* _vehicleFrontVehicle; +extern Vehicle* _vehicleFrontVehicle; extern CoordsXYZ unk_F64E20; /** Helper macro until rides are stored in this module. */ diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index c4f37d73f8..ac472c8fe5 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -889,7 +889,7 @@ const vehicle_boundbox VehicleBoundboxes[16][224] = { // 6D5214 static void vehicle_sprite_paint( - paint_session* session, const rct_vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { int32_t baseImage_id = ebx; @@ -955,7 +955,7 @@ static void vehicle_sprite_paint( // 6D520E static void vehicle_sprite_paint_6D520E( - paint_session* session, const rct_vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicle_sprite_paint(session, vehicle, ebx + vehicle->swing_sprite, ecx, z, vehicleEntry); @@ -963,7 +963,7 @@ static void vehicle_sprite_paint_6D520E( // 6D51EB static void vehicle_sprite_paint_6D51EB( - paint_session* session, const rct_vehicle* vehicle, int32_t ebx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) + paint_session* session, const Vehicle* vehicle, int32_t ebx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { int32_t ecx = ebx / 2; if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) @@ -980,7 +980,7 @@ static void vehicle_sprite_paint_6D51EB( // 6D51DE static void vehicle_sprite_paint_6D51DE( - paint_session* session, const rct_vehicle* vehicle, int32_t ebx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) + paint_session* session, const Vehicle* vehicle, int32_t ebx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->restraints_position < 64) { @@ -1007,7 +1007,7 @@ static void vehicle_sprite_paint_6D51DE( // 6D51DE static void vehicle_sprite_0_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry); @@ -1015,7 +1015,7 @@ static void vehicle_sprite_0_0( // 6D4EE7 static void vehicle_sprite_0_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) @@ -1032,7 +1032,7 @@ static void vehicle_sprite_0_1( // 6D4F34 static void vehicle_sprite_0_2( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) @@ -1049,7 +1049,7 @@ static void vehicle_sprite_0_2( // 6D4F0C static void vehicle_sprite_0_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) @@ -1066,7 +1066,7 @@ static void vehicle_sprite_0_3( // 6D4F5C static void vehicle_sprite_0_4( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) @@ -1083,7 +1083,7 @@ static void vehicle_sprite_0_4( // 6D4F84 static void vehicle_sprite_0_5( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1104,7 +1104,7 @@ static void vehicle_sprite_0_5( // 6D4FE4 static void vehicle_sprite_0_6( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1125,7 +1125,7 @@ static void vehicle_sprite_0_6( // 6D5055 static void vehicle_sprite_0_7( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1146,7 +1146,7 @@ static void vehicle_sprite_0_7( // 6D50C6 static void vehicle_sprite_0_8( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1167,7 +1167,7 @@ static void vehicle_sprite_0_8( // 6D5137 static void vehicle_sprite_0_9( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1188,7 +1188,7 @@ static void vehicle_sprite_0_9( // 6D4FB1 static void vehicle_sprite_0_10( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1209,7 +1209,7 @@ static void vehicle_sprite_0_10( // 6D501B static void vehicle_sprite_0_11( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1230,7 +1230,7 @@ static void vehicle_sprite_0_11( // 6D508C static void vehicle_sprite_0_12( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1251,7 +1251,7 @@ static void vehicle_sprite_0_12( // 6D50FD static void vehicle_sprite_0_13( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1272,7 +1272,7 @@ static void vehicle_sprite_0_13( // 6D516E static void vehicle_sprite_0_14( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -1293,7 +1293,7 @@ static void vehicle_sprite_0_14( // 6D4EE4 static void vehicle_sprite_0_16( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -1311,7 +1311,7 @@ static void vehicle_sprite_0_16( // 6D4F31 static void vehicle_sprite_0_17( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -1329,7 +1329,7 @@ static void vehicle_sprite_0_17( // 6D4F09 static void vehicle_sprite_0_18( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -1347,7 +1347,7 @@ static void vehicle_sprite_0_18( // 6D4F59 static void vehicle_sprite_0_19( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -1365,7 +1365,7 @@ static void vehicle_sprite_0_19( // 6D51D7 static void vehicle_sprite_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3DE4: @@ -1436,7 +1436,7 @@ static void vehicle_sprite_0( // 6D4614 static void vehicle_sprite_1_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) @@ -1453,7 +1453,7 @@ static void vehicle_sprite_1_0( // 6D4662 static void vehicle_sprite_1_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -1470,7 +1470,7 @@ static void vehicle_sprite_1_1( // 6D46DB static void vehicle_sprite_1_2( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) @@ -1487,7 +1487,7 @@ static void vehicle_sprite_1_2( // 6D467D static void vehicle_sprite_1_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -1504,7 +1504,7 @@ static void vehicle_sprite_1_3( // 6D46FD static void vehicle_sprite_1_4( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) @@ -1522,7 +1522,7 @@ static void vehicle_sprite_1_4( // 6D460D static void vehicle_sprite_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3C04: @@ -1593,7 +1593,7 @@ static void vehicle_sprite_1( // 6D4791 static void vehicle_sprite_2_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) @@ -1619,7 +1619,7 @@ static void vehicle_sprite_2_0( // 6D4833 static void vehicle_sprite_2_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -1636,7 +1636,7 @@ static void vehicle_sprite_2_1( // 6D48D6 static void vehicle_sprite_2_2( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) @@ -1663,7 +1663,7 @@ static void vehicle_sprite_2_2( // 6D4858 static void vehicle_sprite_2_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -1681,7 +1681,7 @@ static void vehicle_sprite_2_3( // 6D4910 static void vehicle_sprite_2_4( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) @@ -1710,7 +1710,7 @@ static void vehicle_sprite_2_4( // 6D476C static void vehicle_sprite_2( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3CA4: @@ -1781,7 +1781,7 @@ static void vehicle_sprite_2( // 6D49DC static void vehicle_sprite_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) @@ -1798,7 +1798,7 @@ static void vehicle_sprite_3( // 6D4A31 static void vehicle_sprite_4( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) @@ -1815,7 +1815,7 @@ static void vehicle_sprite_4( // 6D463D static void vehicle_sprite_5_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) @@ -1832,7 +1832,7 @@ static void vehicle_sprite_5_0( // 6D469B static void vehicle_sprite_5_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -1849,7 +1849,7 @@ static void vehicle_sprite_5_1( // 6D4722 static void vehicle_sprite_5_2( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) @@ -1867,7 +1867,7 @@ static void vehicle_sprite_5_2( // 6D46B9 static void vehicle_sprite_5_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -1884,7 +1884,7 @@ static void vehicle_sprite_5_3( // 6D4747 static void vehicle_sprite_5_4( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) @@ -1902,7 +1902,7 @@ static void vehicle_sprite_5_4( // 6D4636 static void vehicle_sprite_5( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3C54: @@ -1973,7 +1973,7 @@ static void vehicle_sprite_5( // 6D47E4 static void vehicle_sprite_6_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) @@ -1999,7 +1999,7 @@ static void vehicle_sprite_6_0( // 6D4880 static void vehicle_sprite_6_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -2017,7 +2017,7 @@ static void vehicle_sprite_6_1( // 6D4953 static void vehicle_sprite_6_2( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) @@ -2046,7 +2046,7 @@ static void vehicle_sprite_6_2( // 6D48AB static void vehicle_sprite_6_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -2064,7 +2064,7 @@ static void vehicle_sprite_6_3( // 6D4996 static void vehicle_sprite_6_4( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) @@ -2093,7 +2093,7 @@ static void vehicle_sprite_6_4( // 6D47DD static void vehicle_sprite_6( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3CF4: @@ -2164,7 +2164,7 @@ static void vehicle_sprite_6( // 6D4A05 static void vehicle_sprite_7( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) @@ -2181,7 +2181,7 @@ static void vehicle_sprite_7( // 6D4A59 static void vehicle_sprite_8( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) @@ -2198,7 +2198,7 @@ static void vehicle_sprite_8( // 6D4A81 static void vehicle_sprite_9( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2215,7 +2215,7 @@ static void vehicle_sprite_9( // 6D4AE8 static void vehicle_sprite_10( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2232,7 +2232,7 @@ static void vehicle_sprite_10( // 6D4B57 static void vehicle_sprite_11( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2249,7 +2249,7 @@ static void vehicle_sprite_11( // 6D4BB7 static void vehicle_sprite_12( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2266,7 +2266,7 @@ static void vehicle_sprite_12( // 6D4C17 static void vehicle_sprite_13( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2283,7 +2283,7 @@ static void vehicle_sprite_13( // 6D4C77 static void vehicle_sprite_14( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2300,7 +2300,7 @@ static void vehicle_sprite_14( // 6D4CD7 static void vehicle_sprite_15( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2317,7 +2317,7 @@ static void vehicle_sprite_15( // 6D4D37 static void vehicle_sprite_16( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) @@ -2334,7 +2334,7 @@ static void vehicle_sprite_16( // 6D4AA3 static void vehicle_sprite_17( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2359,7 +2359,7 @@ static void vehicle_sprite_17( // 6D4B0D static void vehicle_sprite_18( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2385,7 +2385,7 @@ static void vehicle_sprite_18( // 6D4B80 static void vehicle_sprite_19( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2406,7 +2406,7 @@ static void vehicle_sprite_19( // 6D4BE0 static void vehicle_sprite_20( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2427,7 +2427,7 @@ static void vehicle_sprite_20( // 6D4C40 static void vehicle_sprite_21( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2448,7 +2448,7 @@ static void vehicle_sprite_21( // 6D4CA0 static void vehicle_sprite_22( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2469,7 +2469,7 @@ static void vehicle_sprite_22( // 6D4D00 static void vehicle_sprite_23( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2490,7 +2490,7 @@ static void vehicle_sprite_23( // 6D51A5 static void vehicle_sprite_24( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) @@ -2512,7 +2512,7 @@ static void vehicle_sprite_24( // 6D4D67 static void vehicle_sprite_50_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) @@ -2529,7 +2529,7 @@ static void vehicle_sprite_50_0( // 6D4DB5 static void vehicle_sprite_50_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -2547,7 +2547,7 @@ static void vehicle_sprite_50_1( // 6D4DD3 static void vehicle_sprite_50_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -2565,7 +2565,7 @@ static void vehicle_sprite_50_3( // 6D4D60 static void vehicle_sprite_50( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3D44: @@ -2636,7 +2636,7 @@ static void vehicle_sprite_50( // 6D4E3A static void vehicle_sprite_51( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) @@ -2653,7 +2653,7 @@ static void vehicle_sprite_51( // 6D4E8F static void vehicle_sprite_52( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) @@ -2670,7 +2670,7 @@ static void vehicle_sprite_52( // 6D4D90 static void vehicle_sprite_53_0( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) @@ -2687,7 +2687,7 @@ static void vehicle_sprite_53_0( // 6D4DF4 static void vehicle_sprite_53_1( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -2705,7 +2705,7 @@ static void vehicle_sprite_53_1( // 6D4E15 static void vehicle_sprite_53_3( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) @@ -2723,7 +2723,7 @@ static void vehicle_sprite_53_3( // 6D4D89 static void vehicle_sprite_53( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { // 0x009A3D94: @@ -2794,7 +2794,7 @@ static void vehicle_sprite_53( // 6D4E63 static void vehicle_sprite_54( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) @@ -2811,7 +2811,7 @@ static void vehicle_sprite_54( // 6D4EB8 static void vehicle_sprite_55( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) @@ -2828,7 +2828,7 @@ static void vehicle_sprite_55( // 6D47DA static void vehicle_sprite_56( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -2837,7 +2837,7 @@ static void vehicle_sprite_56( // 6D4A02 static void vehicle_sprite_57( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -2855,7 +2855,7 @@ static void vehicle_sprite_57( // 6D4A56 static void vehicle_sprite_58( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { vehicleEntry--; @@ -2873,7 +2873,7 @@ static void vehicle_sprite_58( // 6D4773 static void vehicle_sprite_59( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL) @@ -2890,7 +2890,7 @@ static void vehicle_sprite_59( // 0x009A3B14: using vehicle_sprite_func = void (*)( - paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z, + paint_session* session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const rct_ride_entry_vehicle* vehicleEntry); // clang-format off @@ -2962,7 +2962,7 @@ static constexpr const vehicle_sprite_func vehicle_sprite_funcs[] = { * * rct2: 0x006D5600 */ -static void vehicle_visual_splash1_effect(paint_session* session, int32_t z, const rct_vehicle* vehicle) +static void vehicle_visual_splash1_effect(paint_session* session, int32_t z, const Vehicle* vehicle) { if ((vehicle->track_type >> 2) != TRACK_ELEM_WATER_SPLASH) { @@ -2989,7 +2989,7 @@ static void vehicle_visual_splash1_effect(paint_session* session, int32_t z, con * * rct2: 0x006D5696 */ -static void vehicle_visual_splash2_effect(paint_session* session, int32_t z, const rct_vehicle* vehicle) +static void vehicle_visual_splash2_effect(paint_session* session, int32_t z, const Vehicle* vehicle) { if (vehicle->sprite_direction & 7) { @@ -3012,7 +3012,7 @@ static void vehicle_visual_splash2_effect(paint_session* session, int32_t z, con * * rct2: 0x006D57EE */ -static void vehicle_visual_splash3_effect(paint_session* session, int32_t z, const rct_vehicle* vehicle) +static void vehicle_visual_splash3_effect(paint_session* session, int32_t z, const Vehicle* vehicle) { if (vehicle->sprite_direction & 7) { @@ -3035,9 +3035,9 @@ static void vehicle_visual_splash3_effect(paint_session* session, int32_t z, con * * rct2: 0x006D5783 */ -static void vehicle_visual_splash4_effect(paint_session* session, int32_t z, const rct_vehicle* vehicle) +static void vehicle_visual_splash4_effect(paint_session* session, int32_t z, const Vehicle* vehicle) { - rct_vehicle* vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + Vehicle* vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); if (vehicle2->velocity <= 0x50000) { return; @@ -3059,9 +3059,9 @@ static void vehicle_visual_splash4_effect(paint_session* session, int32_t z, con * * rct2: 0x006D5701 */ -static void vehicle_visual_splash5_effect(paint_session* session, int32_t z, const rct_vehicle* vehicle) +static void vehicle_visual_splash5_effect(paint_session* session, int32_t z, const Vehicle* vehicle) { - rct_vehicle* vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + Vehicle* vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); if (vehicle2->velocity <= 0x50000) { return; @@ -3084,7 +3084,7 @@ static void vehicle_visual_splash5_effect(paint_session* session, int32_t z, con } void vehicle_visual_splash_effect( - paint_session* session, int32_t z, const rct_vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) + paint_session* session, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { switch (vehicleEntry->effect_visual) { @@ -3111,7 +3111,7 @@ void vehicle_visual_splash_effect( * rct2: 0x006D45F8 */ void vehicle_visual_default( - paint_session* session, int32_t imageDirection, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t imageDirection, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->vehicle_sprite_type < std::size(vehicle_sprite_funcs)) @@ -3124,7 +3124,7 @@ void vehicle_visual_default( * * rct2: 0x006D4244 */ -void vehicle_paint(paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection) +void vehicle_paint(paint_session* session, const Vehicle* vehicle, int32_t imageDirection) { rct_ride_entry* rideEntry = nullptr; const rct_ride_entry_vehicle* vehicleEntry; diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h index af014e846d..a48b879960 100644 --- a/src/openrct2/ride/VehiclePaint.h +++ b/src/openrct2/ride/VehiclePaint.h @@ -14,7 +14,7 @@ struct paint_session; struct rct_ride_entry_vehicle; -struct rct_vehicle; +struct Vehicle; struct vehicle_boundbox { @@ -28,40 +28,40 @@ struct vehicle_boundbox extern const vehicle_boundbox VehicleBoundboxes[16][224]; -void vehicle_paint(paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection); +void vehicle_paint(paint_session* session, const Vehicle* vehicle, int32_t imageDirection); void vehicle_visual_default( - paint_session* session, int32_t imageDirection, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t imageDirection, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_roto_drop( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_observation_tower( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_river_rapids( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_reverser( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_splash_boats_or_water_coaster( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_launched_freefall( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_splash_effect( - paint_session* session, int32_t z, const rct_vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); + paint_session* session, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_virginia_reel( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_submarine( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry); void vehicle_visual_mini_golf_player( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle); + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle); void vehicle_visual_mini_golf_ball( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle); + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle); #endif diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 4c0af567c0..ece005976e 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -26,11 +26,11 @@ * rct2: 0x006D4453 */ void vehicle_visual_reverser( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { - rct_vehicle* v1 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); - rct_vehicle* v2 = GET_VEHICLE(vehicle->next_vehicle_on_ride); + Vehicle* v1 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); + Vehicle* v2 = GET_VEHICLE(vehicle->next_vehicle_on_ride); x = (v1->x + v2->x) / 2; y = (v1->y + v2->y) / 2; z = (v1->z + v2->z) / 2; diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 6622a08c9b..795307bb74 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -151,7 +151,7 @@ static constexpr const uint32_t virginia_reel_track_pieces_flat_quarter_turn_1_t * rct2: 0x006D5B48 */ void vehicle_visual_virginia_reel( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { const uint8_t rotation = session->CurrentRotation; diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index d7625c45a8..b049b6fb66 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -62,7 +62,7 @@ static void paint_ferris_wheel_structure( if (rideEntry == nullptr) return; - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; int8_t xOffset = !(direction & 1) ? axisOffset : 0; int8_t yOffset = (direction & 1) ? axisOffset : 0; diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 802f9f12de..5d3f2d7b7b 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -51,7 +51,7 @@ static void paint_haunted_house_structure( if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_SPRITE; - rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[0]); + Vehicle* vehicle = GET_VEHICLE(ride->vehicles[0]); session->CurrentlyDrawnItem = vehicle; frameNum = vehicle->vehicle_sprite_type; } diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 312d5a1379..fe742542ea 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -37,7 +37,7 @@ static void paint_merry_go_round_structure( if (rideEntry == nullptr) return; - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; uint32_t baseImageId = rideEntry->vehicles[0].base_image_id; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL) diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index c33fac9fe9..f12e1a4ac2 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -1189,7 +1189,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(int32_t trackType, int32 * rct2: 0x006D42F0 */ void vehicle_visual_mini_golf_player( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle) + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle) { if (vehicle->num_peeps == 0) { @@ -1229,7 +1229,7 @@ void vehicle_visual_mini_golf_player( * rct2: 0x006D43C6 */ void vehicle_visual_mini_golf_ball( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle) + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle) { if (vehicle->mini_golf_current_animation != 1) { diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index a4d0dfae9b..82eec916e9 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -28,7 +28,7 @@ enum * rct2: 0x006D6258 */ void vehicle_visual_observation_tower( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { int32_t image_id; diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 91f5896984..4cbc68db65 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -40,7 +40,7 @@ static void paint_space_rings_structure(paint_session* session, Ride* ride, uint if (ride->num_stations == 0 || vehicleIndex < ride->num_vehicles) { rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; int32_t frameNum = direction; diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 0e99996487..38f310fe51 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -23,7 +23,7 @@ static void paint_enterprise_structure( const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; if (rideEntry == nullptr) { diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 631f223538..96887da8a9 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -32,7 +32,7 @@ static constexpr const uint32_t launched_freefall_fence_sprites[] = { SPR_FENCE_ * rct2: 0x006D5FAB */ void vehicle_visual_launched_freefall( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { auto imageFlags = SPRITE_ID_PALETTE_COLOUR_2(vehicle->colours.body_colour, vehicle->colours.trim_colour); diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index fc01700ed8..e8d3a6451c 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -54,7 +54,7 @@ static constexpr const bound_box MagicCarpetBounds[] = { { 0, 8, 32, 16 }, { 8, 0, 16, 32 }, { 0, 8, 32, 16 }, { 8, 0, 16, 32 } }; -static rct_vehicle* get_first_vehicle(Ride* ride) +static Vehicle* get_first_vehicle(Ride* ride) { if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) { @@ -157,7 +157,7 @@ static void paint_magic_carpet_vehicle( rct_drawpixelinfo* dpi = &session->DPI; if (dpi->zoom_level <= 1 && (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) { - rct_vehicle* vehicle = get_first_vehicle(ride); + Vehicle* vehicle = get_first_vehicle(ride); if (vehicle != nullptr) { uint32_t baseImageId = IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS | (vehicleImageId + 4); @@ -179,7 +179,7 @@ static void paint_magic_carpet_structure( paint_session* session, Ride* ride, uint8_t direction, int8_t axisOffset, uint16_t height) { const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); - rct_vehicle* vehicle = get_first_vehicle(ride); + Vehicle* vehicle = get_first_vehicle(ride); uint32_t swingImageId = 0; if (vehicle != nullptr) diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 3854b09cc1..a03f5b8f72 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -43,7 +43,7 @@ static void paint_motionsimulator_vehicle( const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) { uint16_t spriteIndex = ride->vehicles[0]; diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index 6c2647f577..3af9502300 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -63,7 +63,7 @@ static void paint_pirate_ship_structure( const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; int8_t xOffset = !(direction & 1) ? axisOffset : 0; int8_t yOffset = (direction & 1) ? axisOffset : 0; diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 38de6cfb78..18bc7a4e25 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -32,7 +32,7 @@ enum * rct2: 0x006D5DA9 */ void vehicle_visual_roto_drop( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { auto imageFlags = SPRITE_ID_PALETTE_COLOUR_2(vehicle->colours.body_colour, vehicle->colours.trim_colour); diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index e126165a35..a3aeb4cef5 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -52,7 +52,7 @@ static void paint_swinging_inverter_ship_structure( const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; int8_t xOffset = !(direction & 1) ? axisOffset : 0; int8_t yOffset = (direction & 1) ? axisOffset : 0; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 61d7a5e3f0..1c9a663aff 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -57,7 +57,7 @@ static void top_spin_paint_vehicle( height += 3; rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; uint8_t seatRotation = 0; int8_t armRotation = 0; diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index c709c36c7d..dd6f034a0c 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -22,7 +22,7 @@ static void paint_twist_structure( const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - rct_vehicle* vehicle = nullptr; + Vehicle* vehicle = nullptr; if (rideEntry == nullptr) { diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index cdaefc8f36..ed6c6d81b5 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -178,7 +178,7 @@ static constexpr const uint32_t river_rapids_track_pieces_25_deg_down_to_flat[][ * rct2: 0x006D5889 */ void vehicle_visual_river_rapids( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { int32_t image_id; diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index ba238ccdc3..8adebb3367 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -1247,7 +1247,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(int32_t trackType, in * rct2: 0x006D4295 */ void vehicle_visual_splash_boats_or_water_coaster( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { if (vehicle->IsHead()) diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 472c4fb5af..2e15e16b46 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -21,7 +21,7 @@ * rct2: 0x006D44D5 */ void vehicle_visual_submarine( - paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle, + paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry) { auto imageFlags = SPRITE_ID_PALETTE_COLOUR_3(vehicle->colours.body_colour, vehicle->colours.trim_colour); diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index 871a325091..83432a3bf0 100644 --- a/src/openrct2/world/Sprite.h +++ b/src/openrct2/world/Sprite.h @@ -120,7 +120,7 @@ union rct_sprite SpriteGeneric generic; Peep peep; Litter litter; - rct_vehicle vehicle; + Vehicle vehicle; Balloon balloon; Duck duck; JumpingFountain jumping_fountain; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 3242ca146c..2958676295 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -269,7 +269,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(item_standard_flags); } -static void CompareSpriteDataVehicle(const rct_vehicle& left, const rct_vehicle& right) +static void CompareSpriteDataVehicle(const Vehicle& left, const Vehicle& right) { COMPARE_FIELD(vehicle_sprite_type); COMPARE_FIELD(bank_rotation);