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

use correct logic for function name

This commit is contained in:
Ted John 2016-04-22 18:37:25 +01:00
parent bed916e4aa
commit 67da464e08
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rct1/S4Importer.cpp
View File

@ -434,13 +434,13 @@ void S4Importer::ImportRide(rct_ride * dst, rct1_ride * src)
memset(dst, 0, sizeof(rct_ride));
dst->type = RCT1::GetRideType(src->type);
if (RCT1::RideTypeHasVehicle(src->type))
if (RCT1::RideTypeUsesVehicles(src->type))
{
dst->subtype = _rideTypeToRideEntryMap[src->type];
dst->subtype = _vehicleTypeToRideEntryMap[src->vehicle_type];
}
else
{
dst->subtype = _vehicleTypeToRideEntryMap[src->vehicle_type];
dst->subtype = _rideTypeToRideEntryMap[src->type];
}
rct_ride_entry * rideEntry = get_ride_entry(dst->subtype);

2
src/rct1/import.h
View File

@ -10,7 +10,7 @@ namespace RCT1
uint8 GetTerrainEdge(uint8 terrainEdge);
uint8 GetRideType(uint8 rideType);
bool RideTypeHasVehicle(uint8 rideType);
bool RideTypeUsesVehicles(uint8 rideType);
bool PathIsQueue(uint8 pathType);
uint8 NormalisePathAddition(uint8 pathAdditionType);

6
src/rct1/tables.cpp
View File

@ -195,7 +195,7 @@ namespace RCT1
return map[rideType];
}
bool RideTypeHasVehicle(uint8 rideType)
bool RideTypeUsesVehicles(uint8 rideType)
{
switch (rideType) {
case RCT1_RIDE_TYPE_HEDGE_MAZE:
@ -222,9 +222,9 @@ namespace RCT1
case RCT1_RIDE_TYPE_COFFEE_SHOP:
case RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL:
case RCT1_RIDE_TYPE_LEMONADE_STALL:
return true;
default:
return false;
default:
return true;
}
}