mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Code Issues Releases Wiki Activity

Fix incorrect terminology

Browse Source
This commit is contained in:
Michael Steenbeek
2017-07-18 18:07:43 +02:00
committed by GitHub
parent ad4eaff323
commit 7a4e7e17a1
21 changed files with 93 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/openrct2/ride/RideGroupManager.cpp
View File

@@ -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)