From 7a4e7e17a15e63bfe7adef7a7afd7737de042ccb Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 18 Jul 2017 18:07:43 +0200 Subject: [PATCH] Fix incorrect terminology --- src/openrct2/management/award.c | 44 +++++++++++------------ src/openrct2/management/research.c | 6 ++-- src/openrct2/peep/peep.c | 14 ++++---- src/openrct2/ride/RideGroupManager.cpp | 38 ++++++++++---------- src/openrct2/ride/RideGroupManager.h | 8 ++--- src/openrct2/ride/gentle/circus_show.c | 4 +-- src/openrct2/ride/gentle/ferris_wheel.c | 4 +-- src/openrct2/ride/gentle/merry_go_round.c | 4 +-- src/openrct2/ride/gentle/mini_golf.c | 9 +++-- src/openrct2/ride/ride.c | 6 ++-- src/openrct2/ride/ride.h | 12 +++---- src/openrct2/ride/thrill/3d_cinema.c | 4 +-- src/openrct2/ride/thrill/enterprise.c | 4 +-- src/openrct2/ride/thrill/twist.c | 4 +-- src/openrct2/ride/track.c | 2 +- src/openrct2/ride/track_design.c | 2 +- src/openrct2/scenario/scenario.c | 8 ++--- src/openrct2/windows/new_ride.c | 8 ++--- src/openrct2/windows/ride.c | 2 +- src/openrct2/windows/ride_construction.c | 2 +- src/openrct2/windows/track_list.c | 2 +- 21 files changed, 93 insertions(+), 94 deletions(-) diff --git a/src/openrct2/management/award.c b/src/openrct2/management/award.c index aceb7c8ed1..327fad3b65 100644 --- a/src/openrct2/management/award.c +++ b/src/openrct2/management/award.c @@ -150,15 +150,15 @@ static sint32 award_is_deserved_best_rollercoasters(sint32 awardType, sint32 act { sint32 i, rollerCoasters; rct_ride *ride; - rct_ride_entry *rideType; + rct_ride_entry *rideEntry; rollerCoasters = 0; FOR_ALL_RIDES(i, ride) { - rideType = get_ride_entry(ride->subtype); - if (rideType == NULL) { + rideEntry = get_ride_entry(ride->subtype); + if (rideEntry == NULL) { continue; } - if (rideType->category[0] != RIDE_GROUP_ROLLERCOASTER && rideType->category[1] != RIDE_GROUP_ROLLERCOASTER) + if (rideEntry->category[0] != RIDE_CATEGORY_ROLLERCOASTER && rideEntry->category[1] != RIDE_CATEGORY_ROLLERCOASTER) continue; if (ride->status != RIDE_STATUS_OPEN || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) @@ -298,7 +298,7 @@ static sint32 award_is_deserved_best_food(sint32 awardType, sint32 activeAwardTy sint32 i, hungryPeeps, shops, uniqueShops; uint64 shopTypes; rct_ride *ride; - rct_ride_entry *rideType; + rct_ride_entry *rideEntry; uint16 spriteIndex; rct_peep *peep; @@ -315,12 +315,12 @@ static sint32 award_is_deserved_best_food(sint32 awardType, sint32 activeAwardTy continue; shops++; - rideType = get_ride_entry(ride->subtype); - if (rideType == NULL) { + rideEntry = get_ride_entry(ride->subtype); + if (rideEntry == NULL) { continue; } - if (!(shopTypes & (1ULL << rideType->shop_item))) { - shopTypes |= (1ULL << rideType->shop_item); + if (!(shopTypes & (1ULL << rideEntry->shop_item))) { + shopTypes |= (1ULL << rideEntry->shop_item); uniqueShops++; } } @@ -347,7 +347,7 @@ static sint32 award_is_deserved_worst_food(sint32 awardType, sint32 activeAwardT sint32 i, hungryPeeps, shops, uniqueShops; uint64 shopTypes; rct_ride *ride; - rct_ride_entry *rideType; + rct_ride_entry *rideEntry; uint16 spriteIndex; rct_peep *peep; @@ -364,12 +364,12 @@ static sint32 award_is_deserved_worst_food(sint32 awardType, sint32 activeAwardT continue; shops++; - rideType = get_ride_entry(ride->subtype); - if (rideType == NULL) { + rideEntry = get_ride_entry(ride->subtype); + if (rideEntry == NULL) { continue; } - if (!(shopTypes & (1ULL << rideType->shop_item))) { - shopTypes |= (1ULL << rideType->shop_item); + if (!(shopTypes & (1ULL << rideEntry->shop_item))) { + shopTypes |= (1ULL << rideEntry->shop_item); uniqueShops++; } } @@ -460,15 +460,15 @@ static sint32 award_is_deserved_best_water_rides(sint32 awardType, sint32 active { sint32 i, waterRides; rct_ride *ride; - rct_ride_entry *rideType; + rct_ride_entry *rideEntry; waterRides = 0; FOR_ALL_RIDES(i, ride) { - rideType = get_ride_entry(ride->subtype); - if (rideType == NULL) { + rideEntry = get_ride_entry(ride->subtype); + if (rideEntry == NULL) { continue; } - if (rideType->category[0] != RIDE_GROUP_WATER && rideType->category[1] != RIDE_GROUP_WATER) + if (rideEntry->category[0] != RIDE_CATEGORY_WATER && rideEntry->category[1] != RIDE_CATEGORY_WATER) continue; if (ride->status != RIDE_STATUS_OPEN || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) @@ -563,15 +563,15 @@ static sint32 award_is_deserved_best_gentle_rides(sint32 awardType, sint32 activ { sint32 i, gentleRides; rct_ride *ride; - rct_ride_entry *rideType; + rct_ride_entry *rideEntry; gentleRides = 0; FOR_ALL_RIDES(i, ride) { - rideType = get_ride_entry(ride->subtype); - if (rideType == NULL) { + rideEntry = get_ride_entry(ride->subtype); + if (rideEntry == NULL) { continue; } - if (rideType->category[0] != RIDE_GROUP_GENTLE && rideType->category[1] != RIDE_GROUP_GENTLE) + if (rideEntry->category[0] != RIDE_CATEGORY_GENTLE && rideEntry->category[1] != RIDE_CATEGORY_GENTLE) continue; if (ride->status != RIDE_STATUS_OPEN || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) diff --git a/src/openrct2/management/research.c b/src/openrct2/management/research.c index 1242844954..593ff94124 100644 --- a/src/openrct2/management/research.c +++ b/src/openrct2/management/research.c @@ -189,11 +189,11 @@ void research_finish_item(sint32 entryIndex) if (rideEntry != NULL && rideEntry != (rct_ride_entry *)-1 && base_ride_type != RIDE_TYPE_NULL) { bool ride_group_was_invented_before = false; - bool track_type_was_invented_before = ride_type_is_invented(base_ride_type); + bool ride_type_was_invented_before = ride_type_is_invented(base_ride_type); rct_string_id availabilityString; // Determine if the ride group this entry belongs to was invented before. - if (gConfigInterface.select_by_track_type && track_type_has_ride_groups(base_ride_type)) + if (gConfigInterface.select_by_track_type && ride_type_has_ride_groups(base_ride_type)) { const ride_group * rideGroup = get_ride_group(base_ride_type, rideEntry); @@ -249,7 +249,7 @@ void research_finish_item(sint32 entryIndex) set_format_arg(0, rct_string_id, rideEntry->name); } // If a vehicle is the first to be invented for its ride group, show the ride group name. - else if (!track_type_was_invented_before || (track_type_has_ride_groups(base_ride_type) && !ride_group_was_invented_before)) + else if (!ride_type_was_invented_before || (ride_type_has_ride_groups(base_ride_type) && !ride_group_was_invented_before)) { rct_ride_name naming = get_ride_naming(base_ride_type, rideEntry); availabilityString = STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE; diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index dfba1bc63d..f47e425e65 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -2403,10 +2403,10 @@ static void peep_go_to_ride_entrance(rct_peep* peep, rct_ride* ride){ sint16 y_shift = word_981D6C[direction].y; uint8 shift_multiplier = 21; - rct_ride_entry* ride_type = get_ride_entry(ride->subtype); - if (ride_type != NULL) { - 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)){ + rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); + if (rideEntry != NULL) { + if (rideEntry->vehicles[rideEntry->default_vehicle].flags_a & VEHICLE_ENTRY_FLAG_A_MINI_GOLF || + rideEntry->vehicles[rideEntry->default_vehicle].flags_b & (VEHICLE_ENTRY_FLAG_B_12 | VEHICLE_ENTRY_FLAG_B_14)){ shift_multiplier = 32; } } @@ -2845,9 +2845,9 @@ static void peep_go_to_ride_exit(rct_peep* peep, rct_ride* ride, sint16 x, sint1 sint16 shift_multiplier = 20; - rct_ride_entry* ride_type = get_ride_entry(ride->subtype); - if (ride_type != NULL) { - rct_ride_entry_vehicle* vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle]; + rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); + if (rideEntry != NULL) { + rct_ride_entry_vehicle* vehicle_entry = &rideEntry->vehicles[rideEntry->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; diff --git a/src/openrct2/ride/RideGroupManager.cpp b/src/openrct2/ride/RideGroupManager.cpp index 4f4871b73a..da59435d55 100644 --- a/src/openrct2/ride/RideGroupManager.cpp +++ b/src/openrct2/ride/RideGroupManager.cpp @@ -32,56 +32,56 @@ class RideGroupManager final : public IRideGroupManager { public: ride_group ride_group_corkscrew_rc = { - /*.track_type =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, + /*.ride_type =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, /*.maximum_height =*/ 28, /*.available_track_pieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER), /*.naming =*/ { STR_CORKSCREW_RC_GROUP, STR_CORKSCREW_RC_GROUP_DESC }, }; ride_group ride_group_hypercoaster = { - /*.track_type =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, + /*.ride_type =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, /*.maximum_height =*/ 45, /*.available_track_pieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_STEEP_LONG), /*.naming =*/ { STR_HYPERCOASTER_GROUP, STR_HYPERCOASTER_GROUP_DESC }, }; ride_group ride_group_car_ride = { - /*.track_type =*/ RIDE_TYPE_CAR_RIDE, + /*.ride_type =*/ RIDE_TYPE_CAR_RIDE, /*.maximum_height =*/ 6, /*.available_track_pieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_SPINNING_TUNNEL), /*.naming =*/ { STR_CAR_RIDE_GROUP, STR_CAR_RIDE_GROUP_DESC }, }; ride_group ride_group_monster_trucks = { - /*.track_type =*/ RIDE_TYPE_CAR_RIDE, + /*.ride_type =*/ RIDE_TYPE_CAR_RIDE, /*.maximum_height =*/ 18, /*.available_track_pieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_RAPIDS), /*.naming =*/ { STR_MONSTER_TRUCKS_GROUP, STR_MONSTER_TRUCKS_GROUP_DESC }, }; ride_group ride_group_steel_twister_rc = { - /*.track_type =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER, + /*.ride_type =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER, /*.maximum_height =*/ 34, /*.available_track_pieces =*/ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BARREL_ROLL) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_HALF_LOOP_LARGE) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG) | (1ULL << TRACK_CURVE_VERTICAL) | (1ULL << TRACK_QUARTER_LOOP) | (1ULL << TRACK_BOOSTER), /*.naming =*/ { STR_STEEL_TWISTER_GROUP, STR_STEEL_TWISTER_GROUP_DESC }, }; ride_group ride_group_hyper_twister = { - /*.track_type =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER, + /*.ride_type =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER, /*.maximum_height =*/ 54, /*.available_track_pieces =*/ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG), /*.naming =*/ { STR_HYPER_TWISTER_GROUP, STR_HYPER_TWISTER_GROUP_DESC }, }; ride_group ride_group_junior_rc = { - /*.track_type =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER, + /*.ride_type =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER, /*.maximum_height =*/ 12, /*.available_track_pieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER), /*.naming =*/ { STR_JUNIOR_RC_GROUP, STR_JUNIOR_RC_GROUP_DESC }, }; ride_group ride_group_midi_coaster = { - /*.track_type =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER, + /*.ride_type =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER, /*.maximum_height =*/ 15, /*.available_track_pieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER), /*.naming =*/ { STR_MIDI_COASTER_GROUP, STR_MIDI_COASTER_GROUP_DESC }, @@ -92,9 +92,9 @@ public: ride_group car_ride_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { ride_group_car_ride, ride_group_monster_trucks }; ride_group twister_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { ride_group_steel_twister_rc, ride_group_hyper_twister }; - const ride_group * GetRideGroup(uint8 trackType, rct_ride_entry * rideEntry) const override + const ride_group * GetRideGroup(uint8 rideType, rct_ride_entry * rideEntry) const override { - switch (trackType) { + switch (rideType) { case RIDE_TYPE_CORKSCREW_ROLLER_COASTER: if (rideEntry->enabledTrackPieces & (1ULL << TRACK_VERTICAL_LOOP)) return (ride_group *) &ride_group_corkscrew_rc; @@ -120,13 +120,13 @@ public: } } - bool TrackTypeHasRideGroups(uint8 trackType) const override + bool RideTypeHasRideGroups(uint8 rideType) const override { if (!gConfigInterface.select_by_track_type) { return false; } - switch (trackType) + switch (rideType) { case RIDE_TYPE_CORKSCREW_ROLLER_COASTER: case RIDE_TYPE_JUNIOR_ROLLER_COASTER: @@ -174,10 +174,10 @@ public: bool RideGroupIsInvented(const ride_group * rideGroup) const override { - if (!ride_type_is_invented(rideGroup->track_type)) + if (!ride_type_is_invented(rideGroup->ride_type)) return false; - uint8 *rideEntryIndexPtr = get_ride_entry_indices_for_ride_type(rideGroup->track_type); + uint8 *rideEntryIndexPtr = get_ride_entry_indices_for_ride_type(rideGroup->ride_type); while (*rideEntryIndexPtr != RIDE_ENTRY_INDEX_NULL) { @@ -187,7 +187,7 @@ public: continue; rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); - const ride_group * rideEntryRideGroup = GetRideGroup(rideGroup->track_type, rideEntry); + const ride_group * rideEntryRideGroup = GetRideGroup(rideGroup->ride_type, rideEntry); if (!RideGroupsAreEqual(rideGroup, rideEntryRideGroup)) continue; @@ -208,16 +208,16 @@ IRideGroupManager * GetRideGroupManager() extern "C" { - const ride_group * get_ride_group(uint8 trackType, rct_ride_entry * rideEntry) + const ride_group * get_ride_group(uint8 rideType, rct_ride_entry * rideEntry) { const IRideGroupManager * rideGroupManager = GetRideGroupManager(); - return rideGroupManager->GetRideGroup(trackType, rideEntry); + return rideGroupManager->GetRideGroup(rideType, rideEntry); } - bool track_type_has_ride_groups(uint8 trackType) + bool ride_type_has_ride_groups(uint8 rideType) { const IRideGroupManager * rideGroupManager = GetRideGroupManager(); - return rideGroupManager->TrackTypeHasRideGroups(trackType); + return rideGroupManager->RideTypeHasRideGroups(rideType); } ride_group * ride_group_find(uint8 rideType, uint8 index) diff --git a/src/openrct2/ride/RideGroupManager.h b/src/openrct2/ride/RideGroupManager.h index f0f826bae9..230ef4fc0c 100644 --- a/src/openrct2/ride/RideGroupManager.h +++ b/src/openrct2/ride/RideGroupManager.h @@ -29,7 +29,7 @@ extern "C" #define MAX_RIDE_GROUPS_PER_RIDE_TYPE 2 typedef struct ride_group { - uint8 track_type; + uint8 ride_type; uint16 maximum_height; uint64 available_track_pieces; rct_ride_name naming; @@ -41,7 +41,7 @@ interface IRideGroupManager virtual ~IRideGroupManager() { } virtual const ride_group * GetRideGroup(uint8 trackType, rct_ride_entry * rideEntry) const abstract; - virtual bool TrackTypeHasRideGroups(uint8 trackType) const abstract; + virtual bool RideTypeHasRideGroups(uint8 trackType) const abstract; virtual ride_group * RideGroupFind(uint8 rideType, uint8 index) const abstract; virtual bool RideGroupsAreEqual(const ride_group * a, const ride_group * b) const abstract; virtual bool RideGroupIsInvented(const ride_group * rideGroup) const abstract; @@ -52,8 +52,8 @@ IRideGroupManager * GetRideGroupManager(); extern "C" { #endif - const ride_group * get_ride_group(uint8 trackType, rct_ride_entry * rideEntry); - bool track_type_has_ride_groups(uint8 trackType); + const ride_group * get_ride_group(uint8 rideType, rct_ride_entry * rideEntry); + bool ride_type_has_ride_groups(uint8 rideType); ride_group * ride_group_find(uint8 rideType, uint8 index); bool ride_groups_are_equal(const ride_group * a, const ride_group * b); bool ride_group_is_invented(const ride_group * rideGroup); diff --git a/src/openrct2/ride/gentle/circus_show.c b/src/openrct2/ride/gentle/circus_show.c index 05023fa707..151f7f8797 100644 --- a/src/openrct2/ride/gentle/circus_show.c +++ b/src/openrct2/ride/gentle/circus_show.c @@ -28,7 +28,7 @@ static void paint_circus_show_tent(uint8 rideIndex, uint8 direction, sint8 al, s rct_map_element * savedMapElement = g_currently_drawn_item; rct_ride * ride = get_ride(rideIndex); - rct_ride_entry * ride_type = get_ride_entry(ride->subtype); + rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL) { @@ -37,7 +37,7 @@ static void paint_circus_show_tent(uint8 rideIndex, uint8 direction, sint8 al, s } uint32 imageColourFlags = gTrackColours[SCHEME_MISC]; - uint32 imageId = ride_type->vehicles[0].base_image_id; + uint32 imageId = rideEntry->vehicles[0].base_image_id; if (imageColourFlags == 0x20000000) { imageColourFlags = ride->vehicle_colours[0].body_colour << 19 | ride->vehicle_colours[0].trim_colour << 24 | 0xA0000000; imageId += direction; diff --git a/src/openrct2/ride/gentle/ferris_wheel.c b/src/openrct2/ride/gentle/ferris_wheel.c index 5e348fb04f..11e9323de3 100644 --- a/src/openrct2/ride/gentle/ferris_wheel.c +++ b/src/openrct2/ride/gentle/ferris_wheel.c @@ -61,7 +61,7 @@ static void paint_ferris_wheel_structure(uint8 rideIndex, uint8 direction, sint8 rct_map_element * savedMapElement = g_currently_drawn_item; rct_ride * ride = get_ride(rideIndex); - rct_ride_entry * rideType = get_ride_entry(ride->subtype); + rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; sint8 xOffset = !(direction & 1) ? axisOffset : 0; @@ -69,7 +69,7 @@ static void paint_ferris_wheel_structure(uint8 rideIndex, uint8 direction, sint8 height += 7; - baseImageId = rideType->vehicles[0].base_image_id; + 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/merry_go_round.c b/src/openrct2/ride/gentle/merry_go_round.c index e7f78c5de0..059f9ee51e 100644 --- a/src/openrct2/ride/gentle/merry_go_round.c +++ b/src/openrct2/ride/gentle/merry_go_round.c @@ -39,10 +39,10 @@ static void paint_merry_go_round_structure(uint8 rideIndex, uint8 direction, sin height += 7; rct_ride * ride = get_ride(rideIndex); - rct_ride_entry * ride_type = get_ride_entry(ride->subtype); + rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; - uint32 baseImageId = ride_type->vehicles[0].base_image_id; + uint32 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/mini_golf.c b/src/openrct2/ride/gentle/mini_golf.c index 3d45dc6171..0bb5649ef3 100644 --- a/src/openrct2/ride/gentle/mini_golf.c +++ b/src/openrct2/ride/gentle/mini_golf.c @@ -1037,13 +1037,13 @@ void vehicle_visual_mini_golf_player(sint32 x, sint32 imageDirection, sint32 y, return; } - rct_ride_entry *rideType = get_ride_entry(get_ride(vehicle->ride)->subtype); + rct_ride_entry *rideEntry = get_ride_entry(get_ride(vehicle->ride)->subtype); rct_sprite *sprite = get_sprite(vehicle->peep[0]); uint8 frame = mini_golf_peep_animation_frames[vehicle->mini_golf_current_animation][vehicle->var_C5]; uint32 ebx = (frame << 2) + (imageDirection >> 3); - uint32 image_id = rideType->vehicles[0].base_image_id + 1 + ebx; + uint32 image_id = rideEntry->vehicles[0].base_image_id + 1 + ebx; uint32 peep_palette = sprite->peep.tshirt_colour << 19 | sprite->peep.trousers_colour << 24 | 0x0A0000000; sub_98197C(image_id | peep_palette, 0, 0, 1, 1, 11, z, 0, 0, z + 5, get_current_rotation()); } @@ -1067,9 +1067,8 @@ void vehicle_visual_mini_golf_ball(sint32 x, sint32 imageDirection, sint32 y, si } rct_ride *ride = get_ride(vehicle->ride); - rct_ride_entry *rideType = get_ride_entry(ride->subtype); - //log_info("base_image_id: %d, image_id: %d", rideType->vehicles[0].base_image_id, rideType->vehicles[0].base_image_id & 0x7FFFF); + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); - uint32 image_id = rideType->vehicles[0].base_image_id; + uint32 image_id = rideEntry->vehicles[0].base_image_id; sub_98197C(image_id, 0, 0, 1, 1, 0, z, 0, 0, z + 3, get_current_rotation()); } diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 6c3bf4f029..96fa047773 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -6248,7 +6248,7 @@ static void ride_set_name_to_track_default(rct_ride *ride, rct_ride_entry * ride if (!gConfigInterface.select_by_track_type && ride->type == RIDE_TYPE_TWISTER_ROLLER_COASTER && !(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE)) { name_args.type_name = STR_HYPER_TWISTER_GROUP; } - else if (track_type_has_ride_groups(ride->type)) { + else if (ride_type_has_ride_groups(ride->type)) { const ride_group * rideGroup = get_ride_group(ride->type, rideEntry); name_args.type_name = rideGroup->naming.name; } else { @@ -6304,7 +6304,7 @@ rct_string_id get_friendly_track_type_name(uint8 trackType, rct_ride_entry * rid return RideNaming[trackType].name; } } else { - if (track_type_has_ride_groups(trackType)) { + if (ride_type_has_ride_groups(trackType)) { const ride_group * rideGroup = get_ride_group(trackType, rideEntry); return rideGroup->naming.name; } else { @@ -6323,7 +6323,7 @@ rct_ride_name get_ride_naming(uint8 rideType, rct_ride_entry * rideEntry) return (rct_ride_name){ STR_HYPER_TWISTER_GROUP, STR_HYPER_TWISTER_GROUP_DESC }; } - if (track_type_has_ride_groups(rideType)) { + if (ride_type_has_ride_groups(rideType)) { const ride_group * rideGroup = get_ride_group(rideType, rideEntry); return rideGroup->naming; } diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h index e213931b08..e4a2611dba 100644 --- a/src/openrct2/ride/ride.h +++ b/src/openrct2/ride/ride.h @@ -631,12 +631,12 @@ enum { }; enum { - RIDE_GROUP_TRANSPORT, - RIDE_GROUP_GENTLE, - RIDE_GROUP_ROLLERCOASTER, - RIDE_GROUP_THRILL, - RIDE_GROUP_WATER, - RIDE_GROUP_SHOP + RIDE_CATEGORY_TRANSPORT, + RIDE_CATEGORY_GENTLE, + RIDE_CATEGORY_ROLLERCOASTER, + RIDE_CATEGORY_THRILL, + RIDE_CATEGORY_WATER, + RIDE_CATEGORY_SHOP }; enum { diff --git a/src/openrct2/ride/thrill/3d_cinema.c b/src/openrct2/ride/thrill/3d_cinema.c index 75fe2d463b..fc79b77f11 100644 --- a/src/openrct2/ride/thrill/3d_cinema.c +++ b/src/openrct2/ride/thrill/3d_cinema.c @@ -28,7 +28,7 @@ static void paint_3d_cinema_structure(uint8 rideIndex, uint8 direction, sint8 xO rct_map_element * savedMapElement = g_currently_drawn_item; rct_ride * ride = get_ride(rideIndex); - rct_ride_entry * ride_type = get_ride_entry(ride->subtype); + rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL) { @@ -41,7 +41,7 @@ static void paint_3d_cinema_structure(uint8 rideIndex, uint8 direction, sint8 xO imageColourFlags = ride->vehicle_colours[0].body_colour << 19 | ride->vehicle_colours[0].trim_colour << 24 | 0xA0000000; } - uint32 imageId = (ride_type->vehicles[0].base_image_id + direction) | imageColourFlags; + uint32 imageId = (rideEntry->vehicles[0].base_image_id + direction) | imageColourFlags; sub_98197C(imageId, xOffset, yOffset, 24, 24, 47, height + 3, xOffset + 16, yOffset + 16, height + 3, get_current_rotation()); g_currently_drawn_item = savedMapElement; diff --git a/src/openrct2/ride/thrill/enterprise.c b/src/openrct2/ride/thrill/enterprise.c index 0cdc80dc6a..5c7496bed4 100644 --- a/src/openrct2/ride/thrill/enterprise.c +++ b/src/openrct2/ride/thrill/enterprise.c @@ -27,10 +27,10 @@ static void paint_enterprise_structure(rct_ride * ride, sint8 xOffset, sint8 yOf height += 7; rct_map_element * savedMapElement = g_currently_drawn_item; - rct_ride_entry * rideType = get_ride_entry(ride->subtype); + rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; - uint32 baseImageId = rideType->vehicles[0].base_image_id; + uint32 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/thrill/twist.c b/src/openrct2/ride/thrill/twist.c index af58464486..3611485f51 100644 --- a/src/openrct2/ride/thrill/twist.c +++ b/src/openrct2/ride/thrill/twist.c @@ -26,11 +26,11 @@ static void paint_twist_structure(rct_ride * ride, uint8 direction, sint8 xOffse { rct_map_element * savedMapElement = g_currently_drawn_item; - rct_ride_entry * rideType = get_ride_entry(ride->subtype); + rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; height += 7; - uint32 baseImageId = rideType->vehicles[0].base_image_id; + uint32 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/track.c b/src/openrct2/ride/track.c index 93f048b1fd..9bde092ae3 100644 --- a/src/openrct2/ride/track.c +++ b/src/openrct2/ride/track.c @@ -1246,7 +1246,7 @@ static money32 track_place(sint32 rideIndex, sint32 type, sint32 originX, sint32 uint16 maxHeight; if (gConfigInterface.select_by_track_type) { - if (track_type_has_ride_groups(ride->type)) { + if (ride_type_has_ride_groups(ride->type)) { const ride_group * rideGroup = get_ride_group(ride->type, rideEntry); maxHeight = rideGroup->maximum_height; } else { diff --git a/src/openrct2/ride/track_design.c b/src/openrct2/ride/track_design.c index 63bd6c5dca..91be52ad35 100644 --- a/src/openrct2/ride/track_design.c +++ b/src/openrct2/ride/track_design.c @@ -1445,7 +1445,7 @@ static money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uin } // The rest of the cases are handled by the code in ride_create() - if (track_type_has_ride_groups(td6->type) && entryIndex == 0xFF) + if (ride_type_has_ride_groups(td6->type) && entryIndex == 0xFF) { const ObjectRepositoryItem * ori = object_repository_find_object_by_name(rideEntryObject->name); if (ori != NULL) diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c index 67315c7198..d89a05c596 100644 --- a/src/openrct2/scenario/scenario.c +++ b/src/openrct2/scenario/scenario.c @@ -664,7 +664,7 @@ static bool scenario_prepare_rides_for_save() // If there are more than 5 roller coasters, only mark the first five. if (isFiveCoasterObjective && rideEntry != NULL && - ((rideEntry->category[0] == RIDE_GROUP_ROLLERCOASTER || rideEntry->category[1] == RIDE_GROUP_ROLLERCOASTER) && + ((rideEntry->category[0] == RIDE_CATEGORY_ROLLERCOASTER || rideEntry->category[1] == RIDE_CATEGORY_ROLLERCOASTER) && rcs < 5)) { ride->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK; @@ -907,7 +907,7 @@ static void scenario_objective_check_10_rollercoasters() } if (rideType != NULL && - (rideType->category[0] == RIDE_GROUP_ROLLERCOASTER || rideType->category[1] == RIDE_GROUP_ROLLERCOASTER) && + (rideType->category[0] == RIDE_CATEGORY_ROLLERCOASTER || rideType->category[1] == RIDE_CATEGORY_ROLLERCOASTER) && ride->status == RIDE_STATUS_OPEN && ride->excitement >= RIDE_RATING(6,00) && type_already_counted[subtype_id] == 0){ type_already_counted[subtype_id]++; @@ -987,7 +987,7 @@ static void scenario_objective_check_10_rollercoasters_length() if (rideType == NULL) { continue; } - if ((rideType->category[0] == RIDE_GROUP_ROLLERCOASTER || rideType->category[1] == RIDE_GROUP_ROLLERCOASTER) && + if ((rideType->category[0] == RIDE_CATEGORY_ROLLERCOASTER || rideType->category[1] == RIDE_CATEGORY_ROLLERCOASTER) && ride->status == RIDE_STATUS_OPEN && ride->excitement >= RIDE_RATING(7,00) && type_already_counted[subtype_id] == 0){ @@ -1022,7 +1022,7 @@ static void scenario_objective_check_finish_5_rollercoasters() if (ride->status != RIDE_STATUS_CLOSED && ride->excitement >= objectiveRideExcitement && (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) && // Set on partially finished coasters - (rideEntry->category[0] == RIDE_GROUP_ROLLERCOASTER || rideEntry->category[1] == RIDE_GROUP_ROLLERCOASTER)) + (rideEntry->category[0] == RIDE_CATEGORY_ROLLERCOASTER || rideEntry->category[1] == RIDE_CATEGORY_ROLLERCOASTER)) rcs++; } diff --git a/src/openrct2/windows/new_ride.c b/src/openrct2/windows/new_ride.c index a9bbc49e3c..c6c160fed8 100644 --- a/src/openrct2/windows/new_ride.c +++ b/src/openrct2/windows/new_ride.c @@ -315,7 +315,7 @@ static void window_new_ride_populate_list() if (ride_type_is_invented(rideType)) { - if (!track_type_has_ride_groups(rideType)) { + if (!ride_type_has_ride_groups(rideType)) { nextListItem = window_new_ride_iterate_over_ride_group(rideType, 0, nextListItem); } else { @@ -360,7 +360,7 @@ static ride_list_item * window_new_ride_iterate_over_ride_group(uint8 rideType, if (!gConfigInterface.select_by_track_type && (currentCategory != rideEntry->category[0] && currentCategory != rideEntry->category[1])) continue; - if (track_type_has_ride_groups(rideType)) + if (ride_type_has_ride_groups(rideType)) { const ride_group * rideEntryRideGroup = get_ride_group(rideType, rideEntry); const ride_group * rideGroup = ride_group_find(rideType, rideGroupIndex); @@ -547,7 +547,7 @@ void window_new_ride_focus(ride_list_item rideItem) if (listItem->type == rideItem.type) { const ride_group * irg = get_ride_group(rideTypeIndex, rideEntry); - if (!track_type_has_ride_groups(rideTypeIndex) || ride_groups_are_equal(rideGroup, irg)) { + if (!ride_type_has_ride_groups(rideTypeIndex) || ride_groups_are_equal(rideGroup, irg)) { _windowNewRideHighlightedItem[0] = rideItem; w->new_ride.highlighted_ride_id = rideItem.ride_type_and_entry; window_new_ride_scroll_to_focused_ride(w); @@ -917,7 +917,7 @@ static sint32 get_num_track_designs(ride_list_item item) } } - if (rideEntry != NULL && track_type_has_ride_groups(item.type)) + if (rideEntry != NULL && ride_type_has_ride_groups(item.type)) { const ride_group * rideGroup = get_ride_group(item.type, rideEntry); return (sint32)track_repository_get_count_for_ride_group(item.type, rideGroup); diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index 44a93b12e5..a331ae8ba0 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -2685,7 +2685,7 @@ static void window_ride_vehicle_mousedown(rct_window *w, rct_widgetindex widgetI continue; // Skip if vehicle does not belong to the same ride group - if (track_type_has_ride_groups(ride->type) && !selectionShouldBeExpanded) + if (ride_type_has_ride_groups(ride->type) && !selectionShouldBeExpanded) { rideGroup = get_ride_group(ride->type, rideEntry); currentRideGroup = get_ride_group(ride->type, currentRideEntry); diff --git a/src/openrct2/windows/ride_construction.c b/src/openrct2/windows/ride_construction.c index 2362cf35ed..8a0340d081 100644 --- a/src/openrct2/windows/ride_construction.c +++ b/src/openrct2/windows/ride_construction.c @@ -2739,7 +2739,7 @@ static void window_ride_construction_update_enabled_track_pieces() } else { - if (track_type_has_ride_groups(rideType)) + if (ride_type_has_ride_groups(rideType)) { const ride_group * rideGroup = get_ride_group(rideType, rideEntry); _enabledRidePieces = rideGroup->available_track_pieces; diff --git a/src/openrct2/windows/track_list.c b/src/openrct2/windows/track_list.c index 82dd8457af..324ad6f2c1 100644 --- a/src/openrct2/windows/track_list.c +++ b/src/openrct2/windows/track_list.c @@ -611,7 +611,7 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, static void track_list_load_designs(ride_list_item item) { - if (!track_type_has_ride_groups(item.type)) { + if (!ride_type_has_ride_groups(item.type)) { char entry[9]; const char *entryPtr = NULL; if (item.type < 0x80) {