mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unneeded C transfer functions from RideGroupManager

This commit is contained in:
Gymnasiast 2017-12-31 21:15:34 +01:00
parent 2a6f2c1763
commit dc68946649
4 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/management/Research.cpp
View File

@ -262,7 +262,7 @@ void research_finish_item(uint32 entryIndex)
}
// If a vehicle is the first to be invented for its ride group, show the ride group name.
else if (!ride_type_was_invented_before ||
(ride_type_has_ride_groups(base_ride_type) && !ride_group_was_invented_before))
(RideGroupManager::RideTypeHasRideGroups(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;

14
src/openrct2/ride/Ride.cpp
View File

@ -5711,7 +5711,7 @@ bool shop_item_has_common_price(sint32 shopItem)
void ride_set_name_to_default(Ride * ride, rct_ride_entry * rideEntry)
{
if (rideTypeIsIndependent(ride->type))
if (RideGroupManager::RideTypeIsIndependent(ride->type))
{
ride_set_name_to_vehicle_default(ride, rideEntry);
}
@ -5728,9 +5728,9 @@ void ride_set_name_to_track_default(Ride *ride, rct_ride_entry * rideEntry)
ride->name = STR_NONE;
if (ride_type_has_ride_groups(ride->type))
if (RideGroupManager::RideTypeHasRideGroups(ride->type))
{
const RideGroup * rideGroup = get_ride_group(ride->type, rideEntry);
const RideGroup * rideGroup = RideGroupManager::GetRideGroup(ride->type, rideEntry);
name_args.type_name = rideGroup->Naming.name;
}
else
@ -5783,12 +5783,12 @@ static void ride_set_name_to_vehicle_default(Ride * ride, rct_ride_entry * rideE
*/
rct_ride_name get_ride_naming(const uint8 rideType, rct_ride_entry * rideEntry)
{
if (ride_type_has_ride_groups(rideType))
if (RideGroupManager::RideTypeHasRideGroups(rideType))
{
const RideGroup * rideGroup = get_ride_group(rideType, rideEntry);
const RideGroup * rideGroup = RideGroupManager::GetRideGroup(rideType, rideEntry);
return rideGroup->Naming;
}
else if (!rideTypeIsIndependent(rideType))
else if (!RideGroupManager::RideTypeIsIndependent(rideType))
{
return RideNaming[rideType];
}
@ -8134,7 +8134,7 @@ sint32 ride_get_entry_index(sint32 rideType, sint32 rideSubType)
continue;
}
if (!rideTypeIsIndependent(rideType))
if (!RideGroupManager::RideTypeIsIndependent(rideType))
{
subType = *rideEntryIndex;
break;

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

@ -435,24 +435,6 @@ bool RideGroupManager::RideTypeIsIndependent(const uint8 rideType)
return true;
}
extern "C"
{
const RideGroup * get_ride_group(uint8 rideType, const rct_ride_entry * rideEntry)
{
return RideGroupManager::GetRideGroup(rideType, rideEntry);
}
bool ride_type_has_ride_groups(const uint8 rideType)
{
return RideGroupManager::RideTypeHasRideGroups(rideType);
}
bool rideTypeIsIndependent(const uint8 rideType)
{
return RideGroupManager::RideTypeIsIndependent(rideType);
}
}
const uint8 gRideCategories[] = {
RIDE_CATEGORY_ROLLERCOASTER, // Spiral Roller coaster
RIDE_CATEGORY_ROLLERCOASTER, // Stand Up Coaster

10
src/openrct2/ride/RideGroupManager.h
View File

@ -54,14 +54,4 @@ class RideGroupManager
static sint32 VehiclePreferenceCompare(const uint8 rideType, const char * a, const char * b);
static bool RideTypeIsIndependent(const uint8 rideType);
};
extern "C"
{
#endif
const RideGroup * get_ride_group(const uint8 rideType, const rct_ride_entry * rideEntry);
bool ride_type_has_ride_groups(const uint8 rideType);
bool rideTypeIsIndependent(const uint8 rideType);
#ifdef __cplusplus
}
#endif