mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 11:15:13 +01:00
Code Issues Releases Wiki Activity

Rename IS_SHOP to IS_SHOP_OR_FACILITY and use it for RideObject

Browse Source
This commit is contained in:
frutiemax
2022-07-31 12:45:41 -04:00
committed by Gymnasiast
parent 2d75858589
commit 6868b3dcaf
20 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/object/RideObject.cpp
View File

@@ -863,19 +863,7 @@ std::vector<VehicleColour> RideObject::ReadJsonColourConfiguration(json_t& jColo
bool RideObject::IsRideTypeShopOrFacility(uint8_t rideType)
{
switch (rideType)
{
case RIDE_TYPE_TOILETS:
case RIDE_TYPE_SHOP:
case RIDE_TYPE_DRINK_STALL:
case RIDE_TYPE_FOOD_STALL:
case RIDE_TYPE_INFORMATION_KIOSK:
case RIDE_TYPE_CASH_MACHINE:
case RIDE_TYPE_FIRST_AID:
return true;
default:
return false;
}
return GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY);
}
uint8_t RideObject::ParseRideType(const std::string& s)