From eb645cd4f32f1882d537dd52ee7d61add1ad4c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 15 Feb 2016 12:39:36 +0100 Subject: [PATCH 1/3] Rename ride_entry functions and provide better logging For hacked rides, provide the name of offender in the log. --- src/ride/ride.c | 16 ++++++++++++---- src/ride/ride.h | 2 +- src/ride/vehicle.c | 2 +- src/windows/ride.c | 34 ++++++++++++++++----------------- src/windows/ride_construction.c | 2 +- src/world/map.c | 2 +- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index 28adc12486..36111d6c67 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -184,9 +184,16 @@ rct_ride_measurement *get_ride_measurement(int index) return &(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_MEASUREMENTS, rct_ride_measurement)[index]); } -rct_ride_type *ride_get_entry(rct_ride *ride) +rct_ride_type *get_ride_entry_by_ride(rct_ride *ride) { - return get_ride_entry(ride->subtype); + rct_ride_type *type = get_ride_entry(ride->subtype); + if (type == NULL) + { + char oldname[128]; + format_string(oldname, ride->name, &ride->name_arguments); + log_error("Invalid ride subtype for ride %s", oldname); + } + return type; } /** @@ -307,7 +314,8 @@ money32 ride_calculate_income_per_hour(rct_ride *ride) money32 customersPerHour, priceMinusCost; int currentShopItem; - entry = get_ride_entry(ride->subtype); + // Get entry by ride to provide better reporting + entry = get_ride_entry_by_ride(ride); if (entry == NULL) { return 0; } @@ -2174,7 +2182,7 @@ static int ride_get_new_breakdown_problem(rct_ride *ride) _breakdownProblemProbabilities[BREAKDOWN_BRAKES_FAILURE] = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, uint8) == 0 ? 3 : 20; - entry = ride_get_entry(ride); + entry = get_ride_entry_by_ride(ride); if (entry->flags & RIDE_ENTRY_FLAG_14) return -1; diff --git a/src/ride/ride.h b/src/ride/ride.h index 7d354c75e1..b329f325b5 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -937,7 +937,7 @@ int ride_get_total_time(rct_ride *ride); int ride_can_have_multiple_circuits(rct_ride *ride); track_colour ride_get_track_colour(rct_ride *ride, int colourScheme); vehicle_colour ride_get_vehicle_colour(rct_ride *ride, int vehicleIndex); -rct_ride_type *ride_get_entry(rct_ride *ride); +rct_ride_type *get_ride_entry_by_ride(rct_ride *ride); uint8 *get_ride_entry_indices_for_ride_type(uint8 rideType); void reset_type_to_ride_entry_index_map(); void ride_measurement_clear(rct_ride *ride); diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index b9591c7813..6bbe522cf8 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -8316,4 +8316,4 @@ void vehicle_invalidate_window(rct_vehicle *vehicle) return; window_invalidate(w); -} \ No newline at end of file +} diff --git a/src/windows/ride.c b/src/windows/ride.c index 50bc1d21ca..cfe5762bc1 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -1041,7 +1041,7 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w) uint8 trainLayout[16]; ride_entry_get_train_layout(ride->subtype, ride->num_cars_per_train, trainLayout); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); if (rideEntry->flags & RIDE_ENTRY_FLAG_0) { clipDPI.zoom_level = 1; clipDPI.width *= 2; @@ -1497,7 +1497,7 @@ static void window_ride_init_viewport(rct_window *w) if (eax >= 0 && eax < ride->num_vehicles && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK){ focus.sprite.sprite_id = ride->vehicles[eax]; - rct_ride_type* ride_entry = ride_get_entry(ride); + rct_ride_type* ride_entry = get_ride_entry_by_ride(ride); if (ride_entry->tab_vehicle != 0){ rct_vehicle* vehicle = GET_VEHICLE(focus.sprite.sprite_id); focus.sprite.sprite_id = vehicle->next_vehicle_on_train; @@ -2329,7 +2329,7 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi bool selectionShouldBeExpanded; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); if(gCheatsShowVehiclesFromOtherTrackTypes && !(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type==RIDE_TYPE_MAZE || ride->type==RIDE_TYPE_MINI_GOLF)) { selectionShouldBeExpanded=true; @@ -2453,7 +2453,7 @@ static void window_ride_vehicle_dropdown(rct_window *w, int widgetIndex, int dro return; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); switch (widgetIndex) { case WIDX_VEHICLE_TYPE_DROPDOWN: @@ -2503,7 +2503,7 @@ static void window_ride_vehicle_invalidate(rct_window *w) window_ride_set_pressed_tab(w); ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, uint16) = ride->name; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride->name_arguments; @@ -2570,7 +2570,7 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi) window_ride_draw_tab_images(dpi, w); ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); x = w->x + 8; y = w->y + 64; @@ -2631,7 +2631,7 @@ static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dp vehicle_colour vehicleColour; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); // Background gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width, dpi->y + dpi->height, 12); @@ -2795,7 +2795,7 @@ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget) dropdownWidget = widget - 1; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); // Seek to available modes for this ride availableModes = ride_seek_available_modes(ride); @@ -3042,7 +3042,7 @@ static void window_ride_operating_invalidate(rct_window *w) window_ride_set_pressed_tab(w); ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, uint16) = ride->name; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride->name_arguments; @@ -3819,7 +3819,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid rct_string_id stringId; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); colourSchemeIndex = w->ride_colour; dropdownWidget = widget - 1; @@ -4054,7 +4054,7 @@ static void window_ride_colour_invalidate(rct_window *w) window_ride_set_pressed_tab(w); ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, uint16) = ride->name; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride->name_arguments; @@ -4219,7 +4219,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) track_colour trackColour; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); window_draw_widgets(w, dpi); window_ride_draw_tab_images(dpi, w); @@ -4317,7 +4317,7 @@ static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi vehicle_colour vehicleColour; ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); vehiclePreviewWidget = &window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW]; vehicleColour = ride_get_vehicle_colour(ride, w->var_48C); @@ -5679,7 +5679,7 @@ static void window_ride_income_invalidate(rct_window *w) RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, uint16) = ride->name; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride->name_arguments; - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); // Primary item w->pressed_widgets &= ~(1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); @@ -5787,7 +5787,7 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi) window_ride_draw_tab_images(dpi, w); ride = get_ride(w->number); - rideEntry = ride_get_entry(ride); + rideEntry = get_ride_entry_by_ride(ride); x = w->x + window_ride_income_widgets[WIDX_PAGE_BACKGROUND].left + 4; y = w->y + window_ride_income_widgets[WIDX_PAGE_BACKGROUND].top + 29; @@ -6016,7 +6016,7 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 5; // Primary shop items sold - shopItem = ride_get_entry(ride)->shop_item; + shopItem = get_ride_entry_by_ride(ride)->shop_item; if (shopItem != 0xFF) { RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, uint16) = ShopItemStringIds[shopItem].plural; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride->no_primary_items_sold; @@ -6027,7 +6027,7 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi) // Secondary shop items sold / on-ride photos sold shopItem = ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO ? RCT2_GLOBAL(0x0097D7CB + (ride->type * 4), uint8) : - ride_get_entry(ride)->shop_item_secondary; + get_ride_entry_by_ride(ride)->shop_item_secondary; if (shopItem != 0xFF) { RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, uint16) = ShopItemStringIds[shopItem].plural; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride->no_secondary_items_sold; diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index dcaa1955f6..f4c151d7e8 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -2691,7 +2691,7 @@ static bool sub_6CA2DF(int *trackType, int *trackDirection, int *rideIndex, int static void window_ride_construction_update_enabled_track_pieces() { rct_ride *ride = get_ride(_currentRideIndex); - rct_ride_type *rideEntry = ride_get_entry(ride); + rct_ride_type *rideEntry = get_ride_entry_by_ride(ride); int rideType = _currentTrackCovered & 2 ? RCT2_ADDRESS(0x0097D4F5, uint8)[ride->type * 8] : ride->type; _enabledRidePiecesA = rideEntry->enabledTrackPiecesA & RCT2_ADDRESS(0x01357444, uint32)[rideType]; diff --git a/src/world/map.c b/src/world/map.c index 91278e8c05..fb1997908c 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -1676,7 +1676,7 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl if(map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; int rideIndex = mapElement->properties.track.ride_index; - int maxHeight = ride_get_entry(get_ride(rideIndex))->max_height; + int maxHeight = get_ride_entry_by_ride(get_ride(rideIndex))->max_height; if(maxHeight == 0) maxHeight = RCT2_GLOBAL(0x97D218 + 8 * get_ride(rideIndex)->type, uint8); int zDelta = mapElement->clearance_height - height; From d19fe0e3340976ef80da61030c1491054b638bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 24 Feb 2016 23:15:47 +0100 Subject: [PATCH 2/3] Make sure null ride type gets handled properly --- data/language/english_uk.txt | 2 ++ src/localisation/string_ids.h | 3 +++ src/ride/ride.c | 14 ++++++++++++-- src/ride/track.c | 2 +- src/windows/ride.c | 8 +++++++- src/windows/ride_construction.c | 3 +++ 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index d0e55a898d..5f1003eb4e 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -4068,6 +4068,8 @@ STR_5760 :Hong Kong Dollars (HK$) STR_5761 :New Taiwan Dollar (NT$) STR_5762 :Chinese Yuan (CN{YEN}) STR_5763 :All files +STR_5764 :Invalid ride type +STR_5765 :Cannot edit rides of invalid type ############# # Scenarios # diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index a84b047462..bb6be03fc6 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -2372,6 +2372,9 @@ enum { STR_ALL_FILES = 5763, + STR_INVALID_RIDE_TYPE = 5764, + STR_CANT_EDIT_INVALID_RIDE_TYPE = 5765, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 }; diff --git a/src/ride/ride.c b/src/ride/ride.c index 36111d6c67..729f061e16 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -841,6 +841,11 @@ void reset_all_ride_build_dates() static int ride_check_if_construction_allowed(rct_ride *ride) { + rct_ride_type *rideType = get_ride_entry_by_ride(ride); + if (rideType == NULL) { + window_error_open(STR_INVALID_RIDE_TYPE, STR_CANT_EDIT_INVALID_RIDE_TYPE); + return 0; + } if (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) { RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 6, uint16) = ride->name; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 8, uint32) = ride->name_arguments; @@ -1684,13 +1689,15 @@ int ride_modify(rct_xy_element *input) int rideIndex, x, y, z, direction, type; rct_xy_element mapElement, endOfTrackElement; rct_ride *ride; + rct_ride_type *rideType; rct_window *constructionWindow; mapElement = *input; rideIndex = mapElement.element->properties.track.ride_index; ride = get_ride(rideIndex); + rideType = get_ride_entry(rideIndex); - if (!ride_check_if_construction_allowed(ride)) + if ((ride == NULL) || (rideType == NULL) || !ride_check_if_construction_allowed(ride)) return 0; if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) { @@ -4940,7 +4947,10 @@ void loc_6B51C0(int rideIndex) ride_try_get_origin_element(rideIndex, &trackElement); ride_find_track_gap(&trackElement, &trackElement); - ride_modify(&trackElement); + int ok = ride_modify(&trackElement); + if (ok == 0) { + return; + } w = window_find_by_class(WC_RIDE_CONSTRUCTION); if (w != NULL) diff --git a/src/ride/track.c b/src/ride/track.c index f4b2e91dd3..0906038d25 100644 --- a/src/ride/track.c +++ b/src/ride/track.c @@ -4384,7 +4384,7 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in return MONEY32_UNDEFINED; } rct_ride_type *rideEntry = get_ride_entry(ride->subtype); - if (rideEntry == (rct_ride_type *)0xFFFFFFFF) + if (rideEntry == (rct_ride_type *)0xFFFFFFFF || rideEntry == NULL) { log_warning("Invalid ride type for track placement, rideIndex = %d", rideIndex); return MONEY32_UNDEFINED; diff --git a/src/windows/ride.c b/src/windows/ride.c index cfe5762bc1..7b1c55babd 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -1159,7 +1159,10 @@ void window_ride_disable_tabs(rct_window *w) rct_ride_type *type = get_ride_entry(ride->subtype); - if ((type->flags & RIDE_ENTRY_FLAG_19) != 0) + if (type == NULL) { + disabled_tabs |= 1 << WIDX_TAB_2 | 1 << WIDX_TAB_3 | 1 << WIDX_TAB_4 | 1 << WIDX_TAB_5 | 1 << WIDX_TAB_6 + | 1 << WIDX_TAB_7 | 1 << WIDX_TAB_8 | 1 << WIDX_TAB_9 | 1 << WIDX_TAB_10; + } else if ((type->flags & RIDE_ENTRY_FLAG_19) != 0) disabled_tabs |= (1 << WIDX_TAB_5); // 0x100 w->disabled_widgets = disabled_tabs; @@ -3360,6 +3363,9 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc ride = get_ride(w->number); ride_type = get_ride_entry(ride->subtype); + if (ride_type == NULL) { + return; + } switch (widgetIndex) { case WIDX_INSPECTION_INTERVAL_DROPDOWN: diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index f4c151d7e8..504b67631e 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -2693,6 +2693,9 @@ static void window_ride_construction_update_enabled_track_pieces() rct_ride *ride = get_ride(_currentRideIndex); rct_ride_type *rideEntry = get_ride_entry_by_ride(ride); + if (rideEntry == NULL) + return; + int rideType = _currentTrackCovered & 2 ? RCT2_ADDRESS(0x0097D4F5, uint8)[ride->type * 8] : ride->type; _enabledRidePiecesA = rideEntry->enabledTrackPiecesA & RCT2_ADDRESS(0x01357444, uint32)[rideType]; _enabledRidePiecesB = rideEntry->enabledTrackPiecesB & RCT2_ADDRESS(0x01357644, uint32)[rideType]; From 14bff0c66f285196db32b150e9c2e7ff75add04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 25 Feb 2016 13:33:19 +0100 Subject: [PATCH 3/3] Rename rct_ride_type to rct_ride_entry --- src/interface/console.c | 2 +- src/interface/viewport.c | 6 +- src/management/award.c | 10 +-- src/management/marketing.c | 2 +- src/management/research.c | 14 ++--- src/object.c | 16 ++--- src/object_list.c | 6 +- src/peep/peep.c | 36 +++++------ src/rct1.c | 2 +- src/rct1.h | 2 +- src/ride/ride.c | 58 ++++++++--------- src/ride/ride.h | 10 +-- src/ride/ride_data.c | 2 +- src/ride/ride_data.h | 2 +- src/ride/ride_ratings.c | 4 +- src/ride/station.c | 2 +- src/ride/track.c | 6 +- src/ride/track_paint.c | 10 +-- src/ride/vehicle.c | 90 +++++++++++++-------------- src/ride/vehicle.h | 4 +- src/scenario.c | 4 +- src/windows/editor_inventions_list.c | 8 +-- src/windows/editor_object_selection.c | 6 +- src/windows/new_campaign.c | 2 +- src/windows/new_ride.c | 10 +-- src/windows/research.c | 4 +- src/windows/ride.c | 56 ++++++++--------- src/windows/ride_construction.c | 2 +- src/windows/track_list.c | 2 +- src/world/map.c | 2 +- 30 files changed, 190 insertions(+), 190 deletions(-) diff --git a/src/interface/console.c b/src/interface/console.c index bc4ae3db4f..e5790bfd91 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -780,7 +780,7 @@ static int cc_load_object(const utf8 **argv, int argc) { reset_loaded_objects(); if (type == OBJECT_TYPE_RIDE) { // Automatically research the ride so it's supported by the game. - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; int rideType; rideEntry = get_ride_entry(entryGroupIndex); diff --git a/src/interface/viewport.c b/src/interface/viewport.c index f1da1271dc..7737f32f8a 100644 --- a/src/interface/viewport.c +++ b/src/interface/viewport.c @@ -1080,8 +1080,8 @@ int sub_98198C(sint8 al, sint8 ah, int image_id, sint8 cl, int height, sint16 le */ void viewport_vehicle_paint_setup(rct_vehicle *vehicle, int imageDirection) { - rct_ride_type *rideEntry; - const rct_ride_type_vehicle *vehicleEntry; + rct_ride_entry *rideEntry; + const rct_ride_entry_vehicle *vehicleEntry; int x = vehicle->x; int y = vehicle->y; @@ -1108,7 +1108,7 @@ void viewport_vehicle_paint_setup(rct_vehicle *vehicle, int imageDirection) } } - uint32 rct2VehiclePtrFormat = ((uint32)vehicleEntry) - offsetof(rct_ride_type, vehicles); + uint32 rct2VehiclePtrFormat = ((uint32)vehicleEntry) - offsetof(rct_ride_entry, vehicles); RCT2_GLOBAL(0x00F64DFC, uint32) = rct2VehiclePtrFormat; switch (vehicleEntry->car_visual) { case VEHICLE_VISUAL_DEFAULT: RCT2_CALLPROC_X(0x006D45F8, x, imageDirection, y, z, (int)vehicle, rct2VehiclePtrFormat, 0); break; diff --git a/src/management/award.c b/src/management/award.c index bc3d9a7461..bc7ce6063f 100644 --- a/src/management/award.c +++ b/src/management/award.c @@ -135,7 +135,7 @@ static int award_is_deserved_best_rollercoasters(int awardType, int activeAwardT { int i, rollerCoasters; rct_ride *ride; - rct_ride_type *rideType; + rct_ride_entry *rideType; rollerCoasters = 0; FOR_ALL_RIDES(i, ride) { @@ -278,7 +278,7 @@ static int award_is_deserved_best_food(int awardType, int activeAwardTypes) int i, hungryPeeps, shops, uniqueShops; uint64 shopTypes; rct_ride *ride; - rct_ride_type *rideType; + rct_ride_entry *rideType; uint16 spriteIndex; rct_peep *peep; @@ -324,7 +324,7 @@ static int award_is_deserved_worst_food(int awardType, int activeAwardTypes) int i, hungryPeeps, shops, uniqueShops; uint64 shopTypes; rct_ride *ride; - rct_ride_type *rideType; + rct_ride_entry *rideType; uint16 spriteIndex; rct_peep *peep; @@ -434,7 +434,7 @@ static int award_is_deserved_best_water_rides(int awardType, int activeAwardType { int i, waterRides; rct_ride *ride; - rct_ride_type *rideType; + rct_ride_entry *rideType; waterRides = 0; FOR_ALL_RIDES(i, ride) { @@ -534,7 +534,7 @@ static int award_is_deserved_best_gentle_rides(int awardType, int activeAwardTyp { int i, gentleRides; rct_ride *ride; - rct_ride_type *rideType; + rct_ride_entry *rideType; gentleRides = 0; FOR_ALL_RIDES(i, ride) { diff --git a/src/management/marketing.c b/src/management/marketing.c index 32569ab7ea..58b63d3f49 100644 --- a/src/management/marketing.c +++ b/src/management/marketing.c @@ -187,7 +187,7 @@ bool marketing_is_campaign_type_applicable(int campaignType) { int i; rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; switch (campaignType) { case ADVERTISING_CAMPAIGN_PARK_ENTRY_FREE: diff --git a/src/management/research.c b/src/management/research.c index 1beab742bf..cfcd2c3bec 100644 --- a/src/management/research.c +++ b/src/management/research.c @@ -168,7 +168,7 @@ static void research_next_design() void research_finish_item(sint32 entryIndex) { int i, ebx, base_ride_type, rideEntryIndex, subSceneryEntryIndex; - rct_ride_type *rideEntry, *rideEntry2; + rct_ride_entry *rideEntry, *rideEntry2; rct_scenery_set_entry *scenerySetEntry; RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, sint32) = entryIndex; @@ -190,7 +190,7 @@ void research_finish_item(sint32 entryIndex) if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE)) { for (i = 0; i < 128; i++) { rideEntry2 = get_ride_entry(i); - if (rideEntry2 == (rct_ride_type*)-1) + if (rideEntry2 == (rct_ride_entry*)-1) continue; if ((rideEntry2->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE)) continue; @@ -363,7 +363,7 @@ void research_remove_non_separate_vehicle_types() researchItem->entryIndex != RESEARCHED_ITEMS_END && researchItem->entryIndex >= 0x10000 ) { - rct_ride_type *rideEntry = get_ride_entry(researchItem->entryIndex & 0xFF); + rct_ride_entry *rideEntry = get_ride_entry(researchItem->entryIndex & 0xFF); if (!(rideEntry->flags & (RIDE_ENTRY_FLAG_SEPARATE_RIDE | RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME))) { // Check if ride type already exists further up for a vehicle type that isn't displayed as a ride researchItem2 = researchItem - 1; @@ -478,14 +478,14 @@ void research_insert(int researched, int entryIndex, int category) */ void research_populate_list_random() { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_scenery_set_entry *scenerySetEntry; int rideType, researched; // Rides for (int i = 0; i < 128; i++) { rideEntry = get_ride_entry(i); - if (rideEntry == (rct_ride_type*)-1) + if (rideEntry == (rct_ride_entry*)-1) continue; researched = (scenario_rand() & 0xFF) > 128; @@ -509,14 +509,14 @@ void research_populate_list_random() void research_populate_list_researched() { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_scenery_set_entry *scenerySetEntry; int rideType; // Rides for (int i = 0; i < 128; i++) { rideEntry = get_ride_entry(i); - if (rideEntry == (rct_ride_type*)-1) + if (rideEntry == (rct_ride_entry*)-1) continue; for (int j = 0; j < 3; j++) { diff --git a/src/object.c b/src/object.c index f45c9bb767..c86dc80c4e 100644 --- a/src/object.c +++ b/src/object.c @@ -455,10 +455,10 @@ typedef struct { static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) { - rct_ride_type *rideEntry = (rct_ride_type*)objectEntry; + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; // After rideEntry is 3 string tables - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_ride_type)); + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_ride_entry)); rideEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_RIDE, entryIndex, 0); rideEntry->description = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_RIDE, entryIndex, 1); @@ -497,7 +497,7 @@ static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) int cur_vehicle_images_offset = images_offset + 3; for (int i = 0; i < 4; i++) { - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[i]; + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[i]; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT) { int al = 1; @@ -714,13 +714,13 @@ static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) static void object_type_ride_unload(void *objectEntry) { - rct_ride_type *rideEntry = (rct_ride_type*)objectEntry; + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; rideEntry->name = 0; rideEntry->description = 0; rideEntry->images_offset = 0; for (int i = 0; i < 4; i++) { - rct_ride_type_vehicle* rideVehicleEntry = &rideEntry->vehicles[i]; + rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[i]; rideVehicleEntry->base_image_id = 0; rideVehicleEntry->var_1C = 0; @@ -754,7 +754,7 @@ static void object_type_ride_unload(void *objectEntry) static bool object_type_ride_test(void *objectEntry) { - rct_ride_type* rideEntry = (rct_ride_type*)objectEntry; + rct_ride_entry* rideEntry = (rct_ride_entry*)objectEntry; if (rideEntry->excitement_multipler > 75) return false; if (rideEntry->intensity_multipler > 75) return false; if (rideEntry->nausea_multipler > 75) return false; @@ -763,7 +763,7 @@ static bool object_type_ride_test(void *objectEntry) static void object_type_ride_paint(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y) { - rct_ride_type *rideEntry = (rct_ride_type*)objectEntry; + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; int imageId = rideEntry->images_offset; if (rideEntry->ride_type[0] == 0xFF) { imageId++; @@ -776,7 +776,7 @@ static void object_type_ride_paint(void *objectEntry, rct_drawpixelinfo *dpi, si static rct_string_id object_type_ride_desc(void *objectEntry) { - rct_ride_type *rideEntry = (rct_ride_type*)objectEntry; + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; // Get description rct_string_id stringId = rideEntry->description; diff --git a/src/object_list.c b/src/object_list.c index 631a6f17ec..aee6809def 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -691,7 +691,7 @@ rct_string_id object_get_name_string_id(rct_object_entry *entry, const void *chu int objectType = entry->flags & 0x0F; switch (objectType) { case OBJECT_TYPE_RIDE: - return ((rct_ride_type*)chunk)->name; + return ((rct_ride_entry*)chunk)->name; case OBJECT_TYPE_SMALL_SCENERY: case OBJECT_TYPE_LARGE_SCENERY: case OBJECT_TYPE_WALLS: @@ -822,12 +822,12 @@ static uint32 install_object_entry(rct_object_entry* entry, rct_object_entry* in static void load_object_filter(rct_object_entry* entry, uint8* chunk, rct_object_filters* filter) { - rct_ride_type *rideType; + rct_ride_entry *rideType; rct_ride_filters *rideFilter; switch (entry->flags & 0xF) { case OBJECT_TYPE_RIDE: - rideType = ((rct_ride_type*)chunk); + rideType = ((rct_ride_entry*)chunk); rideFilter = &(filter->ride); rideFilter->category[0] = rideType->category[0]; diff --git a/src/peep/peep.c b/src/peep/peep.c index c1704ea538..103817db5a 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -1679,7 +1679,7 @@ static void peep_go_to_ride_entrance(rct_peep* peep, rct_ride* ride){ sint16 y_shift = RCT2_ADDRESS(0x00981D6E, sint16)[direction * 2]; uint8 shift_multiplier = 21; - rct_ride_type* ride_type = get_ride_entry(ride->subtype); + rct_ride_entry* ride_type = get_ride_entry(ride->subtype); if (ride_type->vehicles[ride_type->default_vehicle].flags_a & VEHICLE_ENTRY_FLAG_A_MINI_GOLF || ride_type->vehicles[ride_type->default_vehicle].flags_b & (VEHICLE_ENTRY_FLAG_B_12 | VEHICLE_ENTRY_FLAG_B_14)){ shift_multiplier = 32; @@ -1879,7 +1879,7 @@ void peep_update_ride_sub_state_1(rct_peep* peep){ sint16 x, y, xy_distance; rct_ride* ride = get_ride(peep->current_ride); - rct_ride_type* ride_entry = get_ride_entry(ride->subtype); + rct_ride_entry* ride_entry = get_ride_entry(ride->subtype); if (peep_update_action(&x, &y, &xy_distance, peep)) { @@ -1985,7 +1985,7 @@ void peep_update_ride_sub_state_1(rct_peep* peep){ } ride_entry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; + rct_ride_entry_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; if (vehicle_type->flags_b & VEHICLE_ENTRY_FLAG_B_10){ sint16 x, y, z; @@ -2095,8 +2095,8 @@ static void peep_go_to_ride_exit(rct_peep* peep, rct_ride* ride, sint16 x, sint1 sint16 shift_multiplier = 20; - rct_ride_type* ride_type = get_ride_entry(ride->subtype); - rct_ride_type_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; + rct_ride_entry* ride_type = get_ride_entry(ride->subtype); + rct_ride_entry_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; if (vehicle_entry->flags_a & VEHICLE_ENTRY_FLAG_A_MINI_GOLF || vehicle_entry->flags_b & (VEHICLE_ENTRY_FLAG_B_12 | VEHICLE_ENTRY_FLAG_B_14)){ shift_multiplier = 32; @@ -2247,7 +2247,7 @@ static void peep_update_ride_sub_state_2(rct_peep* peep){ vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); } - rct_ride_type* ride_entry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry* ride_entry = get_ride_entry(vehicle->ride_subtype); if (ride_entry->vehicles[0].flags_a & VEHICLE_ENTRY_FLAG_A_MINI_GOLF){ vehicle->mini_golf_flags &= ~(1 << 5); @@ -2397,8 +2397,8 @@ void peep_update_ride_sub_state_7(rct_peep* peep){ peep->current_ride_station = ride_station; - rct_ride_type* ride_entry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicle_entry = &ride_entry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* ride_entry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicle_entry = &ride_entry->vehicles[vehicle->vehicle_type]; if (!(vehicle_entry->flags_b & VEHICLE_ENTRY_FLAG_B_10)){ sint16 x, y, z; @@ -2504,7 +2504,7 @@ void peep_update_ride_sub_state_7(rct_peep* peep){ vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); ride_entry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; + rct_ride_entry_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; uint8 cl = peep->current_seat; uint8 ch = peep->current_seat & 0xF8; @@ -2579,8 +2579,8 @@ static void peep_update_ride_prepare_for_state_9(rct_peep* peep){ sint16 shift_multiplier = 20; - rct_ride_type* ride_type = get_ride_entry(ride->subtype); - rct_ride_type_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; + rct_ride_entry* ride_type = get_ride_entry(ride->subtype); + rct_ride_entry_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; if (vehicle_entry->flags_b & (VEHICLE_ENTRY_FLAG_B_12 | VEHICLE_ENTRY_FLAG_B_14)){ shift_multiplier = 32; } @@ -2701,8 +2701,8 @@ static void peep_update_ride_sub_state_12(rct_peep* peep){ y = vehicle->y; } - rct_ride_type* ride_entry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* ride_entry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; x += vehicle_type->peep_loading_positions[peep->var_37 * 2 + 1]; y += vehicle_type->peep_loading_positions[peep->var_37 * 2 + 2]; @@ -2763,8 +2763,8 @@ static void peep_update_ride_sub_state_13(rct_peep* peep){ y = vehicle->y; } - rct_ride_type* ride_entry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* ride_entry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; x += vehicle_type->peep_loading_positions[peep->var_37 * 2 + 1]; y += vehicle_type->peep_loading_positions[peep->var_37 * 2 + 2]; @@ -2795,8 +2795,8 @@ static void peep_update_ride_sub_state_13(rct_peep* peep){ sint16 shift_multiplier = 20; - rct_ride_type* ride_type = get_ride_entry(ride->subtype); - rct_ride_type_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; + rct_ride_entry* ride_type = get_ride_entry(ride->subtype); + rct_ride_entry_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; if (vehicle_entry->flags_b & (VEHICLE_ENTRY_FLAG_B_12 | VEHICLE_ENTRY_FLAG_B_14)){ shift_multiplier = 32; } @@ -4794,7 +4794,7 @@ static void peep_update_buying(rct_peep* peep) } } else{ - rct_ride_type* ride_type = get_ride_entry(ride->subtype); + rct_ride_entry* ride_type = get_ride_entry(ride->subtype); if (ride_type->shop_item_secondary != 0xFF){ money16 price = ride->price_secondary; diff --git a/src/rct1.c b/src/rct1.c index 41d9406d6b..b517c809e0 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -1808,7 +1808,7 @@ bool vehicleIsHigherInHierarchy(int track_type, char *currentVehicleName, char * return false; } -bool rideTypeShouldLoseSeparateFlag(rct_ride_type *ride) +bool rideTypeShouldLoseSeparateFlag(rct_ride_entry *ride) { if(!gConfigInterface.select_by_track_type) return false; diff --git a/src/rct1.h b/src/rct1.h index 53b2ad6caa..0307647a52 100644 --- a/src/rct1.h +++ b/src/rct1.h @@ -509,6 +509,6 @@ bool rct1_read_sv4(const char *path, rct1_s4 *s4); void rct1_import_s4(rct1_s4 *s4); void rct1_fix_landscape(); bool vehicleIsHigherInHierarchy(int track_type, char *currentVehicleName, char *comparedVehicleName); -bool rideTypeShouldLoseSeparateFlag(rct_ride_type *ride); +bool rideTypeShouldLoseSeparateFlag(rct_ride_entry *ride); #endif diff --git a/src/ride/ride.c b/src/ride/ride.c index 729f061e16..ae6c1448f3 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -128,7 +128,7 @@ static const int RideInspectionInterval[] = { 10, 20, 30, 45, 60, 120, 0, 0 }; -rct_ride_type **gRideTypeList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_type*); +rct_ride_entry **gRideTypeList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*); rct_ride* gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride); bool gGotoStartPlacementMode = false; int gRideRemoveTrackPieceCallbackX; @@ -169,7 +169,7 @@ rct_ride *get_ride(int index) return &gRideList[index]; } -rct_ride_type *get_ride_entry(int index) +rct_ride_entry *get_ride_entry(int index) { if (index < 0 || index >= object_entry_group_counts[0]) { @@ -184,9 +184,9 @@ rct_ride_measurement *get_ride_measurement(int index) return &(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_MEASUREMENTS, rct_ride_measurement)[index]); } -rct_ride_type *get_ride_entry_by_ride(rct_ride *ride) +rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride) { - rct_ride_type *type = get_ride_entry(ride->subtype); + rct_ride_entry *type = get_ride_entry(ride->subtype); if (type == NULL) { char oldname[128]; @@ -310,7 +310,7 @@ money16 get_shop_hot_value(int shopItem) */ money32 ride_calculate_income_per_hour(rct_ride *ride) { - rct_ride_type *entry; + rct_ride_entry *entry; money32 customersPerHour, priceMinusCost; int currentShopItem; @@ -841,7 +841,7 @@ void reset_all_ride_build_dates() static int ride_check_if_construction_allowed(rct_ride *ride) { - rct_ride_type *rideType = get_ride_entry_by_ride(ride); + rct_ride_entry *rideType = get_ride_entry_by_ride(ride); if (rideType == NULL) { window_error_open(STR_INVALID_RIDE_TYPE, STR_CANT_EDIT_INVALID_RIDE_TYPE); return 0; @@ -1689,7 +1689,7 @@ int ride_modify(rct_xy_element *input) int rideIndex, x, y, z, direction, type; rct_xy_element mapElement, endOfTrackElement; rct_ride *ride; - rct_ride_type *rideType; + rct_ride_entry *rideType; rct_window *constructionWindow; mapElement = *input; @@ -2183,7 +2183,7 @@ static void ride_breakdown_update(int rideIndex) static int ride_get_new_breakdown_problem(rct_ride *ride) { int availableBreakdownProblems, monthsOld, totalProbability, randomProbability, problemBits, breakdownProblem; - rct_ride_type *entry; + rct_ride_entry *entry; // Brake failure is more likely when its raining _breakdownProblemProbabilities[BREAKDOWN_BRAKES_FAILURE] = @@ -2967,8 +2967,8 @@ static int ride_get_unused_preset_vehicle_colour(uint8 ride_type, uint8 ride_sub { return 0; } - rct_ride_type *rideEntry = get_ride_entry(ride_sub_type); - if (rideEntry == (rct_ride_type *)0xFFFFFFFF) + rct_ride_entry *rideEntry = get_ride_entry(ride_sub_type); + if (rideEntry == (rct_ride_entry *)0xFFFFFFFF) { return 0; } @@ -2994,7 +2994,7 @@ static int ride_get_unused_preset_vehicle_colour(uint8 ride_type, uint8 ride_sub */ static void ride_set_vehicle_colours_to_random_preset(rct_ride *ride, uint8 preset_index) { - rct_ride_type *rideEntry = get_ride_entry(ride->subtype); + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); vehicle_colour_preset_list *presetList = rideEntry->vehicle_preset_list; if (presetList->count != 255) { ride->colour_scheme_type = RIDE_COLOUR_SCHEME_ALL_SAME; @@ -3705,7 +3705,7 @@ void game_command_set_ride_setting(int *eax, int *ebx, int *ecx, int *edx, int * ride_clear_for_construction(ride_id); ride_remove_peeps(ride_id); - rct_ride_type* ride_entry = get_ride_entry(ride->subtype); + rct_ride_entry* ride_entry = get_ride_entry(ride->subtype); const uint8* available_modes = ride_seek_available_modes(ride); if ((ride_entry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) && !gCheatsShowAllOperatingModes){ @@ -4289,8 +4289,8 @@ rct_vehicle *vehicle_create_car( registers regs = { 0 }; rct_ride *ride = get_ride(rideIndex); - rct_ride_type *rideEntry = get_ride_entry(ride->subtype); - rct_ride_type_vehicle *vehicleEntry = &rideEntry->vehicles[vehicleEntryIndex]; + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); + rct_ride_entry_vehicle *vehicleEntry = &rideEntry->vehicles[vehicleEntryIndex]; rct_vehicle *vehicle = (rct_vehicle*)create_sprite(1); vehicle->sprite_identifier = SPRITE_IDENTIFIER_VEHICLE; @@ -4659,8 +4659,8 @@ bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element *element for (int i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[i]); - rct_ride_type *rideType = get_ride_entry(vehicle->vehicle_type); - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry *rideType = get_ride_entry(vehicle->vehicle_type); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_15)) { vehicle_update_track_motion(vehicle, NULL); @@ -5075,7 +5075,7 @@ int ride_is_valid_for_test(int rideIndex, int goingToBeOpen, int isApplying) } if (ride->subtype != 255) { - rct_ride_type *rideType = get_ride_entry(ride->subtype); + rct_ride_entry *rideType = get_ride_entry(ride->subtype); if (rideType->flags & RIDE_ENTRY_FLAG_NO_INVERSIONS) { RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = STR_TRACK_UNSUITABLE_FOR_TYPE_OF_TRAIN; if (ride_check_track_contains_inversions(&trackElement, &problematicTrackElement)) { @@ -5199,7 +5199,7 @@ int ride_is_valid_for_open(int rideIndex, int goingToBeOpen, int isApplying) } if (ride->subtype != 255) { - rct_ride_type *rideType = get_ride_entry(ride->subtype); + rct_ride_entry *rideType = get_ride_entry(ride->subtype); if (rideType->flags & RIDE_ENTRY_FLAG_NO_INVERSIONS) { RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = STR_TRACK_UNSUITABLE_FOR_TYPE_OF_TRAIN; if (ride_check_track_contains_inversions(&trackElement, &problematicTrackElement)) { @@ -5568,7 +5568,7 @@ static int ride_get_empty_slot() static int ride_get_default_mode(rct_ride *ride) { - const rct_ride_type *rideEntry = get_ride_entry(ride->subtype); + const rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); const uint8 *availableModes = RideAvailableModes; for (int i = 0; i < ride->type; i++) { @@ -5673,7 +5673,7 @@ static money32 ride_get_common_price(rct_ride *forRide) static money32 shop_item_get_common_price(rct_ride *forRide, int shopItem) { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_ride *ride; int i; @@ -5709,7 +5709,7 @@ money32 ride_create(int type, int subType, int flags, int *outRideIndex, int *ou { char rideNameBuffer[256]; rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; int rideIndex, rideEntryIndex; if (type > 90) @@ -5760,7 +5760,7 @@ foundRideEntry: ride = get_ride(rideIndex); rideEntry = get_ride_entry(rideEntryIndex); - if (rideEntry == (rct_ride_type *)0xFFFFFFFF) + if (rideEntry == (rct_ride_entry *)0xFFFFFFFF) { log_warning("Invalid request for ride %u", rideIndex); return MONEY32_UNDEFINED; @@ -6351,7 +6351,7 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es uint8 ride_number; money16 price; rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; bool secondary_price; flags = *ebx; @@ -6373,7 +6373,7 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es price = *edi; secondary_price = (*edx >> 8); - if (rideEntry == (rct_ride_type *)0xFFFFFFFF) + if (rideEntry == (rct_ride_entry *)0xFFFFFFFF) { log_warning("Invalid game command for ride %u", ride_number); *ebx = MONEY32_UNDEFINED; @@ -6731,7 +6731,7 @@ void ride_all_has_any_track_elements(bool *rideIndexArray) * * rct2: 0x006847BA */ -void set_vehicle_type_image_max_sizes(rct_ride_type_vehicle* vehicle_type, int num_images){ +void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int num_images){ uint8 bitmap[200][200] = { 0 }; rct_drawpixelinfo dpi = { @@ -7208,7 +7208,7 @@ static void ride_update_vehicle_colours(int rideIndex) */ void ride_entry_get_train_layout(int rideEntryIndex, int numCarsPerTrain, uint8 *trainLayout) { - rct_ride_type *rideEntry = get_ride_entry(rideEntryIndex); + rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); for (int i = 0; i < numCarsPerTrain; i++) { uint8 vehicleType = rideEntry->default_vehicle; @@ -7297,8 +7297,8 @@ foundTrack: void ride_update_max_vehicles(int rideIndex) { rct_ride *ride; - rct_ride_type *rideEntry; - rct_ride_type_vehicle *vehicleEntry; + rct_ride_entry *rideEntry; + rct_ride_entry_vehicle *vehicleEntry; uint8 trainLayout[16], numCarsPerTrain, numVehicles; int trainLength, maxNumTrains; @@ -7469,7 +7469,7 @@ void ride_set_num_cars_per_vehicle(int rideIndex, int numCarsPerVehicle) void game_command_set_ride_vehicles(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_window *w; int rideIndex, commandType, value; diff --git a/src/ride/ride.h b/src/ride/ride.h index b329f325b5..7fee5c3f31 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -96,7 +96,7 @@ typedef struct { uint8 rear_vehicle; // 0x017 uint8 third_vehicle; // 0x018 uint8 pad_019; - rct_ride_type_vehicle vehicles[4]; // 0x1A + rct_ride_entry_vehicle vehicles[4]; // 0x1A vehicle_colour_preset_list *vehicle_preset_list; // 0x1AE sint8 excitement_multipler; // 0x1B2 sint8 intensity_multipler; // 0x1B3 @@ -112,7 +112,7 @@ typedef struct { uint8 category[2]; // 0x1BE uint8 shop_item; // 0x1C0 uint8 shop_item_secondary; // 0x1C1 -} rct_ride_type; +} rct_ride_entry; /** * Ride structure. @@ -855,7 +855,7 @@ enum { /** Helper macros until rides are stored in this module. */ rct_ride *get_ride(int index); -rct_ride_type *get_ride_entry(int index); +rct_ride_entry *get_ride_entry(int index); rct_ride_measurement *get_ride_measurement(int index); /** @@ -937,7 +937,7 @@ int ride_get_total_time(rct_ride *ride); int ride_can_have_multiple_circuits(rct_ride *ride); track_colour ride_get_track_colour(rct_ride *ride, int colourScheme); vehicle_colour ride_get_vehicle_colour(rct_ride *ride, int vehicleIndex); -rct_ride_type *get_ride_entry_by_ride(rct_ride *ride); +rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride); uint8 *get_ride_entry_indices_for_ride_type(uint8 rideType); void reset_type_to_ride_entry_index_map(); void ride_measurement_clear(rct_ride *ride); @@ -970,7 +970,7 @@ void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, in void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); void ride_clear_for_construction(int rideIndex); -void set_vehicle_type_image_max_sizes(rct_ride_type_vehicle* vehicle_type, int num_images); +void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int num_images); void invalidate_test_results(int rideIndex); void ride_select_next_section(); diff --git a/src/ride/ride_data.c b/src/ride/ride_data.c index 83317353e1..f5f95f4c5f 100644 --- a/src/ride/ride_data.c +++ b/src/ride/ride_data.c @@ -1256,7 +1256,7 @@ const uint32 ShopItemImage[SHOP_ITEM_COUNT] = { 5110, // SHOP_ITEM_EMPTY_BOWL_BLUE }; -const rct_ride_type_vehicle CableLiftVehicle = { +const rct_ride_entry_vehicle CableLiftVehicle = { .rotation_frame_mask = 31, .var_02 = 0, .var_03 = 0, diff --git a/src/ride/ride_data.h b/src/ride/ride_data.h index 505d40a061..0275dd3a06 100644 --- a/src/ride/ride_data.h +++ b/src/ride/ride_data.h @@ -102,7 +102,7 @@ extern const money8 DefaultShopItemPrice[SHOP_ITEM_COUNT]; extern const rct_shop_item_string_types ShopItemStringIds[SHOP_ITEM_COUNT]; extern const uint32 ShopItemImage[SHOP_ITEM_COUNT]; -extern const rct_ride_type_vehicle CableLiftVehicle; +extern const rct_ride_entry_vehicle CableLiftVehicle; extern const uint16 RideFilmLength[3]; extern const uint16 RideCrookedHouseLength[1]; diff --git a/src/ride/ride_ratings.c b/src/ride/ride_ratings.c index 0ed5535ae8..a65ba6e349 100644 --- a/src/ride/ride_ratings.c +++ b/src/ride/ride_ratings.c @@ -780,7 +780,7 @@ static uint16 ride_compute_upkeep(rct_ride *ride) */ static void ride_ratings_apply_adjustments(rct_ride *ride, rating_tuple *ratings) { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rideEntry = get_ride_entry(ride->subtype); @@ -916,7 +916,7 @@ static int sub_65E72D(rct_ride *ride) } int dh = numShelteredEighths; - rct_ride_type *rideType = get_ride_entry(ride->subtype); + rct_ride_entry *rideType = get_ride_entry(ride->subtype); if (rideType->flags & RIDE_ENTRY_FLAG_COVERED_RIDE) numShelteredEighths = 7; diff --git a/src/ride/station.c b/src/ride/station.c index d802c9a583..641d96b000 100644 --- a/src/ride/station.c +++ b/src/ride/station.c @@ -242,7 +242,7 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex) */ static void ride_race_init_vehicle_speeds(rct_ride *ride) { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_vehicle *vehicle; int i; diff --git a/src/ride/track.c b/src/ride/track.c index 0906038d25..ae7b42882a 100644 --- a/src/ride/track.c +++ b/src/ride/track.c @@ -409,7 +409,7 @@ void track_load_list(ride_list_item item) RCT2_GLOBAL(0xF635ED, uint8) = 0; if (item.type < 0x80){ - rct_ride_type* ride_type = get_ride_entry(item.entry_index); + rct_ride_entry* ride_type = get_ride_entry(item.entry_index); if (!(ride_type->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE) || rideTypeShouldLoseSeparateFlag(ride_type)){ item.entry_index = 0xFF; } @@ -4383,8 +4383,8 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in log_warning("Invalid ride for track placement, rideIndex = %d", rideIndex); return MONEY32_UNDEFINED; } - rct_ride_type *rideEntry = get_ride_entry(ride->subtype); - if (rideEntry == (rct_ride_type *)0xFFFFFFFF || rideEntry == NULL) + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); + if (rideEntry == (rct_ride_entry *)0xFFFFFFFF || rideEntry == NULL) { log_warning("Invalid ride type for track placement, rideIndex = %d", rideIndex); return MONEY32_UNDEFINED; diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index 0ef8f443c5..1b0df8e98f 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -105,7 +105,7 @@ static void top_spin_paint_vehicle(sint8 al, sint8 cl, uint8 rideIndex, uint8 di height += 3; rct_ride* ride = get_ride(rideIndex); - rct_ride_type* rideEntry = get_ride_entry(ride->subtype); + rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); rct_vehicle* vehicle = NULL; uint8 seatRotation = 0; @@ -1004,8 +1004,8 @@ static void shop_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 directi RCT2_GLOBAL(0x0141E9D4, sint16) = -1; rct_ride *ride = get_ride(rideIndex); - rct_ride_type *rideEntry = get_ride_entry(ride->subtype); - rct_ride_type_vehicle *firstVehicleEntry = &rideEntry->vehicles[0]; + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); + rct_ride_entry_vehicle *firstVehicleEntry = &rideEntry->vehicles[0]; uint32 imageId = RCT2_GLOBAL(0x00F44198, uint32); if (imageId & 0x80000000) { @@ -1075,8 +1075,8 @@ static void facility_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 dir RCT2_GLOBAL(0x0141E9D4, sint16) = -1; rct_ride *ride = get_ride(rideIndex); - rct_ride_type *rideEntry = get_ride_entry(ride->subtype); - rct_ride_type_vehicle *firstVehicleEntry = &rideEntry->vehicles[0]; + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); + rct_ride_entry_vehicle *firstVehicleEntry = &rideEntry->vehicles[0]; uint32 imageId = RCT2_GLOBAL(0x00F44198, uint32); imageId |= firstVehicleEntry->base_image_id; diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 6bbe522cf8..afe725d73b 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -225,7 +225,7 @@ void vehicle_update_sound_params(rct_vehicle* vehicle) sint32 v19 = vehicle->velocity; - rct_ride_type* ride_type = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry* ride_type = get_ride_entry(vehicle->ride_subtype); uint8 test = ride_type->vehicles[vehicle->vehicle_type].var_5A; if (test & 1) { @@ -646,8 +646,8 @@ static int vehicle_open_restraints(rct_vehicle* vehicle){ vehicle->var_4A = 0; rct_ride* ride = get_ride(vehicle->ride); - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_SPINNING) { if (abs(vehicle->var_B6) <= 700 && @@ -1083,7 +1083,7 @@ static uint16 sub_6D7AC0(int currentSoundId, int currentVolume, int targetSoundI static void vehicle_update(rct_vehicle *vehicle) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; // The cable lift uses the ride type of NULL if (vehicle->ride_subtype == RIDE_TYPE_NULL) { @@ -1093,7 +1093,7 @@ static void vehicle_update(rct_vehicle *vehicle) rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; ride = get_ride(vehicle->ride); if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_TESTING) @@ -1237,8 +1237,8 @@ static void vehicle_update_moving_to_end_of_station(rct_vehicle *vehicle){ break; default: { - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_3)){ if (vehicle->velocity <= 131940){ @@ -1528,8 +1528,8 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle){ */ static void vehicle_update_bumpcar_mode(rct_vehicle* vehicle) { rct_ride* ride = get_ride(vehicle->ride); - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_7 && vehicle->var_C5 != 1) { vehicle->var_C5 = 1; @@ -2139,7 +2139,7 @@ static void vehicle_update_departing_boat_hire(rct_vehicle* vehicle) { */ static void vehicle_update_departing(rct_vehicle* vehicle) { rct_ride* ride = get_ride(vehicle->ride); - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); if (vehicle->sub_state == 0) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_BROKEN_TRAIN) { @@ -2202,7 +2202,7 @@ static void vehicle_update_departing(rct_vehicle* vehicle) { } } - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; switch (ride->mode) { case RIDE_MODE_REVERSE_INCLINE_LAUNCHED_SHUTTLE: @@ -2794,8 +2794,8 @@ static void vehicle_update_arriving(rct_vehicle* vehicle) { ride->mechanic_status != RIDE_MECHANIC_STATUS_4) RCT2_GLOBAL(0x00F64E35, uint8) = 0; - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; if (vehicle->sub_state == 0) { if (ride->mode == RIDE_MODE_RACE && @@ -3116,8 +3116,8 @@ static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle) { } } - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; if (vehicle->velocity <= 439800) { vehicle->acceleration = 4398; @@ -3201,7 +3201,7 @@ static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle) RCT2_GLOBAL(0x00F64E08, sint32) = vehicle->velocity; RCT2_GLOBAL(0x00F64E0C, sint32) = (vehicle->velocity >> 10) * 42; - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); if (vehicleEntry->flags_b & (VEHICLE_ENTRY_FLAG_B_7 | VEHICLE_ENTRY_FLAG_B_8)) { sub_6D63D4(vehicle); } @@ -3450,7 +3450,7 @@ static void sub_6DA280(rct_vehicle *vehicle) uint8 curDirection = ((vehicle->sprite_direction + 19) >> 3) & 3; uint8 randDirection = scenario_rand() & 3; - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); if (scenario_rand() & 1 && (!(rideEntry->flags & RIDE_ENTRY_FLAG_7) || vehicle->lost_time_out > 1920)) { location = *((rct_xy8*)&ride->boat_hire_return_position); rct_xy16 destLocation = { @@ -3520,7 +3520,7 @@ static bool vehicle_is_boat_on_water(rct_vehicle *vehicle, int x, int y) */ static void vehicle_update_swinging(rct_vehicle* vehicle) { rct_ride* ride = get_ride(vehicle->ride); - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); // SubState for this ride means swinging state // 0 == first swing @@ -3695,7 +3695,7 @@ static void vehicle_update_rotating(rct_vehicle* vehicle) { return; rct_ride* ride = get_ride(vehicle->ride); - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); uint8* edi; if (rideEntry->flags & RIDE_ENTRY_FLAG_ALTERNATIVE_ROTATION_MODE_1) { @@ -4253,7 +4253,7 @@ static void vehicle_update_crash(rct_vehicle *vehicle){ static void vehicle_update_sound(rct_vehicle *vehicle) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; // frictionVolume (bl) should be set before hand uint8 frictionVolume = 255, frictionId = 255; // bh screamVolume should be set before hand @@ -4263,7 +4263,7 @@ static void vehicle_update_sound(rct_vehicle *vehicle) ride = get_ride(vehicle->ride); rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; int ecx = abs(vehicle->velocity) - 0x10000; if (ecx >= 0) { @@ -4352,12 +4352,12 @@ static int vehicle_update_scream_sound(rct_vehicle *vehicle) { uint32 r; uint16 spriteIndex; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_vehicle *vehicle2; rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; int totalNumPeeps = vehicle_get_total_num_peeps(vehicle); if (totalNumPeeps == 0) @@ -5154,8 +5154,8 @@ static int vehicle_update_motion_bumper_car(rct_vehicle* vehicle) { edx >>= 5; eax += edx; eax /= vehicle->friction; - rct_ride_type* rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; + rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_3)) { vehicle->acceleration = -eax; @@ -5250,7 +5250,7 @@ const sint32 *dword_9A2970 = (sint32*)0x009A2970; */ static void vehicle_update_track_motion_up_stop_check(rct_vehicle *vehicle) { - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); int verticalG, lateralG; // No up stops (coaster types) @@ -5303,7 +5303,7 @@ static void vehicle_update_track_motion_up_stop_check(rct_vehicle *vehicle) static void sub_6DAB4C_chunk_2(rct_vehicle *vehicle) { rct_ride *ride = get_ride(vehicle->ride); - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); // Is chair lift type if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_12) { @@ -5565,7 +5565,7 @@ static void vehicle_update_swinging_car(rct_vehicle *vehicle) vehicle->var_4E += dword_F64E08 >> swingAmount; } - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); sint16 dx = 3185; if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_5) { dx = 5006; @@ -5959,7 +5959,7 @@ static void vehicle_update_spinning_car(rct_vehicle *vehicle) return; } - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); int spinningInertia = vehicleEntry->spinning_inertia; int trackType = vehicle->track_type >> 2; sint32 dword_F64E08 = RCT2_GLOBAL(0x00F64E08, sint32); @@ -6064,7 +6064,7 @@ static void sub_6D63D4(rct_vehicle *vehicle) uint32 eax; uint32 *var_C8 = (uint32*)&vehicle->var_C8; - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); switch (vehicleEntry->var_11) { case 1: // loc_6D652B *var_C8 += RCT2_GLOBAL(0x00F64E08, uint32); @@ -6351,7 +6351,7 @@ static void vehicle_update_play_water_splash_sound() */ static void vehicle_update_handle_water_splash(rct_vehicle *vehicle) { - rct_ride_type *rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry *rideEntry = get_ride_entry(vehicle->ride_subtype); int trackType = vehicle->track_type >> 2; if (!(rideEntry->flags & RIDE_ENTRY_FLAG_8)) { @@ -6415,7 +6415,7 @@ static bool vehicle_update_motion_collision_detection( ) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_1) return false; - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_6)){ vehicle->var_C4 = 0; @@ -6467,7 +6467,7 @@ static bool vehicle_update_motion_collision_detection( if (z_diff > 16) continue; - rct_ride_type_vehicle* collideType = vehicle_get_vehicle_entry(collideVehicle); + rct_ride_entry_vehicle* collideType = vehicle_get_vehicle_entry(collideVehicle); if (!(collideType->flags_b & VEHICLE_ENTRY_FLAG_B_6)) continue; @@ -6592,7 +6592,7 @@ static void sub_6DB7D6(rct_vehicle *vehicle) */ void sub_6DBF3E(rct_vehicle *vehicle) { - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); vehicle->acceleration = (uint32)((sint32)vehicle->acceleration / RCT2_GLOBAL(0x00F64E10, sint32)); if (vehicle->var_CD == 2) { @@ -6667,7 +6667,7 @@ void sub_6DBF3E(rct_vehicle *vehicle) * * rct2: 0x006DB08C */ -bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_type* rideEntry) { +bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry) { registers regs = { 0 }; RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_end; @@ -6697,7 +6697,7 @@ bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehicle, ui } // TODO check if getting the vehicle entry again is necessary - rct_ride_type_vehicle* vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry_vehicle* vehicleEntry = vehicle_get_vehicle_entry(vehicle); if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_8) { vehicle_update_scenery_door(vehicle); @@ -6837,7 +6837,7 @@ loc_6DB41D: * * rct2: 0x006DAEB9 */ -bool vehicle_update_track_motion_forwards(rct_vehicle *vehicle, rct_ride_type_vehicle* vehicleEntry, rct_ride* ride, rct_ride_type* rideEntry) { +bool vehicle_update_track_motion_forwards(rct_vehicle *vehicle, rct_ride_entry_vehicle* vehicleEntry, rct_ride* ride, rct_ride_entry* rideEntry) { registers regs = { 0 }; loc_6DAEB9: regs.edi = vehicle->track_type; @@ -7044,7 +7044,7 @@ loc_6DB967: * * rct2: 0x006DBAA6 */ -bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_type* rideEntry, uint16* progress) { +bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry, uint16* progress) { RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_start; RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_start; rct_map_element* mapElement = map_get_track_element_at_of_type_seq( @@ -7204,7 +7204,7 @@ bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, u * * rct2: 0x006DBA33 */ -bool vehicle_update_track_motion_backwards(rct_vehicle *vehicle, rct_ride_type_vehicle* vehicleEntry, rct_ride* ride, rct_ride_type* rideEntry) { +bool vehicle_update_track_motion_backwards(rct_vehicle *vehicle, rct_ride_entry_vehicle* vehicleEntry, rct_ride* ride, rct_ride_entry* rideEntry) { registers regs = { 0 }; loc_6DBA33:; @@ -7330,8 +7330,8 @@ int vehicle_update_track_motion_mini_golf(rct_vehicle *vehicle, int* outStation) registers regs = { 0 }; rct_ride *ride = get_ride(vehicle->ride); - rct_ride_type *rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry *rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); rct_map_element *mapElement = NULL; @@ -7965,8 +7965,8 @@ int vehicle_update_track_motion(rct_vehicle *vehicle, int *outStation) registers regs = { 0 }; rct_ride *ride = get_ride(vehicle->ride); - rct_ride_type *rideEntry = get_ride_entry(vehicle->ride_subtype); - rct_ride_type_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); + rct_ride_entry *rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); rct_map_element *mapElement = NULL; @@ -8271,9 +8271,9 @@ loc_6DC316: return regs.eax; } -rct_ride_type_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle) +rct_ride_entry_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle) { - rct_ride_type *rideEntry = get_ride_entry(vehicle->ride_subtype); + rct_ride_entry *rideEntry = get_ride_entry(vehicle->ride_subtype); return &rideEntry->vehicles[vehicle->vehicle_type]; } diff --git a/src/ride/vehicle.h b/src/ride/vehicle.h index b7b95c16c7..43bb30c32d 100644 --- a/src/ride/vehicle.h +++ b/src/ride/vehicle.h @@ -78,7 +78,7 @@ typedef struct { uint8 draw_order; uint8 special_frames; // 0x60 , 0x7A sint8* peep_loading_positions; // 0x61 , 0x7B -} rct_ride_type_vehicle; +} rct_ride_entry_vehicle; typedef struct { uint8 sprite_identifier; // 0x00 @@ -365,7 +365,7 @@ void vehicle_set_map_toolbar(rct_vehicle *vehicle); int vehicle_is_used_in_pairs(rct_vehicle *vehicle); rct_vehicle *vehicle_get_head(rct_vehicle *vehicle); int vehicle_update_track_motion(rct_vehicle *vehicle, int *outStation); -rct_ride_type_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle); +rct_ride_entry_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle); int vehicle_get_total_num_peeps(rct_vehicle *vehicle); void vehicle_invalidate_window(rct_vehicle *vehicle); void vehicle_update_test_finish(rct_vehicle* vehicle); diff --git a/src/scenario.c b/src/scenario.c index 1a597fe2d3..107b415156 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -1298,7 +1298,7 @@ static void scenario_objective_check_10_rollercoasters() FOR_ALL_RIDES(i, ride) { uint8 subtype_id = ride->subtype; - rct_ride_type *rideType = get_ride_entry(subtype_id); + rct_ride_entry *rideType = get_ride_entry(subtype_id); if (rideType != NULL && (rideType->category[0] == RIDE_GROUP_ROLLERCOASTER || rideType->category[1] == RIDE_GROUP_ROLLERCOASTER) && @@ -1376,7 +1376,7 @@ static void scenario_objective_check_10_rollercoasters_length() FOR_ALL_RIDES(i, ride) { uint8 subtype_id = ride->subtype; - rct_ride_type *rideType = get_ride_entry(subtype_id); + rct_ride_entry *rideType = get_ride_entry(subtype_id); if ((rideType->category[0] == RIDE_GROUP_ROLLERCOASTER || rideType->category[1] == RIDE_GROUP_ROLLERCOASTER) && ride->status == RIDE_STATUS_OPEN && ride->excitement >= RIDE_RATING(7,00) && type_already_counted[subtype_id] == 0){ diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index 792c50b9ba..0c98c51f4a 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -195,13 +195,13 @@ static void research_rides_setup(){ uint8 ride_base_type = (research->entryIndex >> 8) & 0xFF; uint8 object_index = research->entryIndex & 0xFF; - rct_ride_type* ride_entry = get_ride_entry(object_index); + rct_ride_entry* ride_entry = get_ride_entry(object_index); uint8 master_found = 0; if (!(ride_entry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE)){ for (uint8 rideType = 0; rideType < object_entry_group_counts[OBJECT_TYPE_RIDE]; rideType++){ - rct_ride_type* master_ride = get_ride_entry(rideType); + rct_ride_entry* master_ride = get_ride_entry(rideType); if (master_ride == NULL || (uint32)master_ride == 0xFFFFFFFF) continue; @@ -305,7 +305,7 @@ static void sub_685A79() */ static rct_string_id research_item_get_name(uint32 researchItem) { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_scenery_set_entry *sceneryEntry; if (researchItem < 0x10000) { @@ -317,7 +317,7 @@ static rct_string_id research_item_get_name(uint32 researchItem) } rideEntry = get_ride_entry(researchItem & 0xFF); - if (rideEntry == NULL || rideEntry == (rct_ride_type*)0xFFFFFFFF) + if (rideEntry == NULL || rideEntry == (rct_ride_entry*)0xFFFFFFFF) return 0; if (rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 2d0476f39a..60b3e4d007 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -732,7 +732,7 @@ void remove_selected_objects_from_research(rct_object_entry* installedObject){ return; if (entry_type == OBJECT_TYPE_RIDE){ - rct_ride_type* rideEntry = (rct_ride_type*)object_entry_groups[entry_type].chunks[entry_index]; + rct_ride_entry* rideEntry = (rct_ride_entry*)object_entry_groups[entry_type].chunks[entry_index]; research_remove(entry_index | rideEntry->ride_type[0] << 8 | 0x10000); research_remove(entry_index | rideEntry->ride_type[1] << 8 | 0x10000); research_remove(entry_index | rideEntry->ride_type[2] << 8 | 0x10000); @@ -1416,7 +1416,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) { y = w->y + w->height - 3 - 12 - 14 - 14; - rct_ride_type *rideType = (rct_ride_type*)stex_entry; + rct_ride_entry *rideType = (rct_ride_entry*)stex_entry; for (int i = 0; i < 3; i++) { if (rideType->ride_type[i] == 255) continue; @@ -1956,7 +1956,7 @@ static void window_editor_object_selection_manage_tracks() RCT2_GLOBAL(0xF44157, uint8) = entry_index; - rct_ride_type* ride_entry = get_ride_entry(entry_index); + rct_ride_entry* ride_entry = get_ride_entry(entry_index); uint8* ride_type_array = &ride_entry->ride_type[0]; int ride_type; diff --git a/src/windows/new_campaign.c b/src/windows/new_campaign.c index 3518c4c99e..98a192a23e 100644 --- a/src/windows/new_campaign.c +++ b/src/windows/new_campaign.c @@ -199,7 +199,7 @@ static void window_new_campaign_get_shop_items() uint64 items = 0; FOR_ALL_RIDES(i, ride) { - rct_ride_type *rideType = get_ride_entry(ride->subtype); + rct_ride_entry *rideType = get_ride_entry(ride->subtype); uint8 itemType = rideType->shop_item; if (itemType != 255) items |= 1LL << itemType; diff --git a/src/windows/new_ride.c b/src/windows/new_ride.c index 441c733e2b..77f449b29d 100644 --- a/src/windows/new_ride.c +++ b/src/windows/new_ride.c @@ -283,7 +283,7 @@ void window_new_ride_init_vars() { /** * rct2: 0x006B6F3E * - * Note: When the user has selection by track type enabled, the categories are determined by the track type, not those in the rct_ride_type. + * Note: When the user has selection by track type enabled, the categories are determined by the track type, not those in the rct_ride_entry. */ static void window_new_ride_populate_list() { @@ -326,7 +326,7 @@ static void window_new_ride_populate_list() continue; // Ride entries - rct_ride_type *rideEntry = get_ride_entry(rideEntryIndex); + rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); // Check if ride is in this category if (!gConfigInterface.select_by_track_type && (currentCategory != rideEntry->category[0] && currentCategory != rideEntry->category[1])) @@ -475,7 +475,7 @@ rct_window *window_new_ride_open_research() void window_new_ride_focus(ride_list_item rideItem) { rct_window *w; - rct_ride_type *rideType; + rct_ride_entry *rideType; w = window_find_by_class(WC_CONSTRUCT_RIDE); if (w == NULL) @@ -788,7 +788,7 @@ static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i int y = 1; ride_list_item *listItem = (ride_list_item*)0x00F43523; while (listItem->type != 255 || listItem->entry_index != 255) { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; // Draw flat button rectangle int flags = 0; if (w->new_ride.selected_ride_id == *((sint16*)listItem)) @@ -867,7 +867,7 @@ static int get_num_track_designs(ride_list_item item) */ static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixelinfo *dpi, ride_list_item item, int x, int y, int width) { - rct_ride_type *rideEntry = get_ride_entry(item.entry_index); + rct_ride_entry *rideEntry = get_ride_entry(item.entry_index); // Ride name and description rct_string_id rideName = rideEntry->name; diff --git a/src/windows/research.c b/src/windows/research.c index aa9383bae3..4f3dd7b045 100644 --- a/src/windows/research.c +++ b/src/windows/research.c @@ -350,7 +350,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp if (RCT2_GLOBAL(RCT2_ADDRESS_RESEARH_PROGRESS_STAGE, uint8) != RESEARCH_STAGE_DESIGNING) { uint32 typeId = RCT2_GLOBAL(RCT2_ADDRESS_NEXT_RESEARCH_ITEM, uint32); if (typeId >= 0x10000) { - rct_ride_type *rideEntry = get_ride_entry(typeId & 0xFF); + rct_ride_entry *rideEntry = get_ride_entry(typeId & 0xFF); stringId = (rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) ? rideEntry->name : ((typeId >> 8) & 0xFF) + 2; @@ -388,7 +388,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp int lastDevelopmentFormat; if (typeId != 0xFFFFFFFF) { if (typeId >= 0x10000) { - rct_ride_type *rideEntry = get_ride_entry(typeId & 0xFF); + rct_ride_entry *rideEntry = get_ride_entry(typeId & 0xFF); stringId = (rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) ? rideEntry->name : ((typeId >> 8) & 0xFF) + 2; diff --git a/src/windows/ride.c b/src/windows/ride.c index 7b1c55babd..4e66432297 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -1011,7 +1011,7 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w) rct_ride *ride; rct_widget *widget; int widgetIndex, spriteIndex, x, y, width, height; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; vehicle_colour vehicleColour; widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE; @@ -1052,7 +1052,7 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w) clipDPI.y *= 2; } - rct_ride_type_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[rideEntry->tab_vehicle]]; + rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[rideEntry->tab_vehicle]]; height += rideVehicleEntry->tab_height; vehicleColour = ride_get_vehicle_colour(ride, 0); @@ -1157,7 +1157,7 @@ void window_ride_disable_tabs(rct_window *w) if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint32) & SCREEN_FLAGS_TRACK_DESIGNER) != 0) disabled_tabs |= (1 << WIDX_TAB_4 | 1 << WIDX_TAB_6 | 1 << WIDX_TAB_9 | 1 << WIDX_TAB_10); // 0x3280 - rct_ride_type *type = get_ride_entry(ride->subtype); + rct_ride_entry *type = get_ride_entry(ride->subtype); if (type == NULL) { disabled_tabs |= 1 << WIDX_TAB_2 | 1 << WIDX_TAB_3 | 1 << WIDX_TAB_4 | 1 << WIDX_TAB_5 | 1 << WIDX_TAB_6 @@ -1500,7 +1500,7 @@ static void window_ride_init_viewport(rct_window *w) if (eax >= 0 && eax < ride->num_vehicles && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK){ focus.sprite.sprite_id = ride->vehicles[eax]; - rct_ride_type* ride_entry = get_ride_entry_by_ride(ride); + rct_ride_entry* ride_entry = get_ride_entry_by_ride(ride); if (ride_entry->tab_vehicle != 0){ rct_vehicle* vehicle = GET_VEHICLE(focus.sprite.sprite_id); focus.sprite.sprite_id = vehicle->next_vehicle_on_train; @@ -2325,7 +2325,7 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi { rct_widget *dropdownWidget = widget - 1; rct_ride *ride; - rct_ride_type *rideEntry, *currentRideEntry; + rct_ride_entry *rideEntry, *currentRideEntry; rct_string_id stringId; int i, minCars, maxCars, cars, numItems, quadIndex, bitIndex, rideEntryIndex, selectedIndex, rideTypeIterator, rideTypeIteratorMax; uint8 *rideEntryIndexPtr; @@ -2450,7 +2450,7 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi static void window_ride_vehicle_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; if (dropdownIndex == -1) return; @@ -2491,7 +2491,7 @@ static void window_ride_vehicle_invalidate(rct_window *w) { rct_widget *widgets; rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_string_id stringId; int carsPerTrain; @@ -2564,7 +2564,7 @@ static void window_ride_vehicle_invalidate(rct_window *w) static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_string_id stringId; int x, y; sint16 factor; @@ -2627,7 +2627,7 @@ rct_vehichle_paintinfo _sprites_to_draw[144]; static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_widget *widget; int x, y, startX, startY, i, j, vehicleColourIndex, spriteIndex; rct_vehichle_paintinfo *nextSpriteToDraw, *current, tmp; @@ -2646,7 +2646,7 @@ static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dp startX = max(2, ((widget->right - widget->left) - ((ride->num_vehicles - 1) * 36)) / 2 - 25); startY = widget->bottom - widget->top - 4; - rct_ride_type_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[0]]; + rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[0]]; startY += rideVehicleEntry->tab_height; // For each train @@ -2657,7 +2657,7 @@ static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dp // For each car in train for (j = 0; j < ride->num_cars_per_train; j++) { - rct_ride_type_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[j]]; + rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[j]]; x += rideVehicleEntry->spacing / 17432; y -= (rideVehicleEntry->spacing / 2) / 17432; @@ -2790,7 +2790,7 @@ static void window_ride_mode_tweak_decrease(rct_window *w) */ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget) { - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_widget *dropdownWidget; rct_ride *ride; const uint8 *availableModes, *mode; @@ -3031,7 +3031,7 @@ static void window_ride_operating_invalidate(rct_window *w) { rct_widget *widgets; rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_string_id format, caption, tooltip; colour_scheme_update(w); @@ -3354,7 +3354,7 @@ static void window_ride_maintenance_resize(rct_window *w) static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; rct_widget *dropdownWidget; int i, j, num_items; uint8 breakdownReason; @@ -3455,7 +3455,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc static void window_ride_maintenance_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; rct_vehicle *vehicle; int i, j, num_items; @@ -3820,7 +3820,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid uint16 colourSchemeIndex; vehicle_colour vehicleColour; rct_widget *dropdownWidget; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; int i, numItems; rct_string_id stringId; @@ -4043,7 +4043,7 @@ static void window_ride_colour_tooldrag(rct_window *w, int widgetIndex, int x, i static void window_ride_colour_invalidate(rct_window *w) { rct_widget *widgets; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_ride *ride; track_colour trackColour; vehicle_colour vehicleColour; @@ -4220,7 +4220,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_drawpixelinfo clippedDpi; rct_widget *widget; rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; int x, y, spriteIndex, terniaryColour; track_colour trackColour; @@ -4317,7 +4317,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_widget *vehiclePreviewWidget; int trainCarIndex, x, y, spriteIndex; vehicle_colour vehicleColour; @@ -4341,7 +4341,7 @@ static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi trainCarIndex = (ride->colour_scheme_type & 3) == RIDE_COLOUR_SCHEME_DIFFERENT_PER_CAR ? w->var_48C : rideEntry->tab_vehicle; - rct_ride_type_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[trainCarIndex]]; + rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[trainLayout[trainCarIndex]]; y += rideVehicleEntry->tab_height; @@ -5408,7 +5408,7 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi static void window_ride_income_toggle_primary_price(rct_window *w) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; uint32 newFlags, shop_item; money16 price; @@ -5455,7 +5455,7 @@ static void window_ride_income_toggle_primary_price(rct_window *w) static void window_ride_income_toggle_secondary_price(rct_window *w) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; uint32 newFlags, shop_item; money16 price; @@ -5498,7 +5498,7 @@ static void window_ride_income_toggle_secondary_price(rct_window *w) static void window_ride_income_increase_primary_price(rct_window *w) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; ride = get_ride(w->number); ride_type = get_ride_entry(ride->subtype); @@ -5523,7 +5523,7 @@ static void window_ride_income_increase_primary_price(rct_window *w) static void window_ride_income_decrease_primary_price(rct_window *w) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; ride = get_ride(w->number); ride_type = get_ride_entry(ride->subtype); @@ -5548,7 +5548,7 @@ static void window_ride_income_decrease_primary_price(rct_window *w) static void window_ride_income_increase_secondary_price(rct_window *w) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; ride = get_ride(w->number); ride_type = get_ride_entry(ride->subtype); @@ -5567,7 +5567,7 @@ static void window_ride_income_increase_secondary_price(rct_window *w) static void window_ride_income_decrease_secondary_price(rct_window *w) { rct_ride *ride; - rct_ride_type *ride_type; + rct_ride_entry *ride_type; ride = get_ride(w->number); ride_type = get_ride_entry(ride->subtype); @@ -5667,7 +5667,7 @@ static void window_ride_income_update(rct_window *w) static void window_ride_income_invalidate(rct_window *w) { rct_widget *widgets; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_string_id stringId; int primaryItem, secondaryItem; @@ -5784,7 +5784,7 @@ static void window_ride_income_invalidate(rct_window *w) static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_ride *ride; - rct_ride_type *rideEntry; + rct_ride_entry *rideEntry; rct_string_id stringId; money32 profit, costPerHour; int x, y, primaryItem, secondaryItem; diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index 504b67631e..f935f402e1 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -2691,7 +2691,7 @@ static bool sub_6CA2DF(int *trackType, int *trackDirection, int *rideIndex, int static void window_ride_construction_update_enabled_track_pieces() { rct_ride *ride = get_ride(_currentRideIndex); - rct_ride_type *rideEntry = get_ride_entry_by_ride(ride); + rct_ride_entry *rideEntry = get_ride_entry_by_ride(ride); if (rideEntry == NULL) return; diff --git a/src/windows/track_list.c b/src/windows/track_list.c index 964f72c4b4..988c685e6f 100644 --- a/src/windows/track_list.c +++ b/src/windows/track_list.c @@ -337,7 +337,7 @@ static void window_track_list_tooltip(rct_window* w, int widgetIndex, rct_string */ static void window_track_list_invalidate(rct_window *w) { - rct_ride_type *entry; + rct_ride_entry *entry; rct_string_id stringId; colour_scheme_update(w); diff --git a/src/world/map.c b/src/world/map.c index fb1997908c..1defd518f9 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -3078,7 +3078,7 @@ static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall return false; } - rct_ride_type *rideEntry = get_ride_entry(ride->subtype); + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); if (rideEntry->flags & RIDE_ENTRY_FLAG_16) { return false; }