mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename enum members
This commit is contained in:
parent
af99bc28c7
commit
481f7565dc
|
@ -36,94 +36,94 @@ namespace RCT1
|
|||
|
||||
enum class RideType : uint8_t
|
||||
{
|
||||
RCT1_RIDE_TYPE_NULL = 255,
|
||||
RCT1_RIDE_TYPE_WOODEN_ROLLER_COASTER = 0,
|
||||
RCT1_RIDE_TYPE_STAND_UP_STEEL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_SUSPENDED_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_STEEL_MINI_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_MINIATURE_RAILWAY,
|
||||
RCT1_RIDE_TYPE_MONORAIL,
|
||||
RCT1_RIDE_TYPE_SUSPENDED_SINGLE_RAIL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_BOAT_HIRE,
|
||||
RCT1_RIDE_TYPE_WOODEN_CRAZY_RODENT_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_CAR_RIDE,
|
||||
RCT1_RIDE_TYPE_LAUNCHED_FREEFALL,
|
||||
RCT1_RIDE_TYPE_BOBSLED_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_OBSERVATION_TOWER,
|
||||
RCT1_RIDE_TYPE_STEEL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_WATER_SLIDE,
|
||||
RCT1_RIDE_TYPE_MINE_TRAIN_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_CHAIRLIFT,
|
||||
RCT1_RIDE_TYPE_STEEL_CORKSCREW_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_HEDGE_MAZE,
|
||||
RCT1_RIDE_TYPE_SPIRAL_SLIDE,
|
||||
RCT1_RIDE_TYPE_GO_KARTS,
|
||||
RCT1_RIDE_TYPE_LOG_FLUME,
|
||||
RCT1_RIDE_TYPE_RIVER_RAPIDS,
|
||||
RCT1_RIDE_TYPE_DODGEMS,
|
||||
RCT1_RIDE_TYPE_SWINGING_SHIP,
|
||||
RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP,
|
||||
RCT1_RIDE_TYPE_ICE_CREAM_STALL,
|
||||
RCT1_RIDE_TYPE_CHIPS_STALL,
|
||||
RCT1_RIDE_TYPE_DRINK_STALL,
|
||||
RCT1_RIDE_TYPE_CANDYFLOSS_STALL,
|
||||
RCT1_RIDE_TYPE_BURGER_BAR,
|
||||
RCT1_RIDE_TYPE_MERRY_GO_ROUND,
|
||||
RCT1_RIDE_TYPE_BALLOON_STALL,
|
||||
RCT1_RIDE_TYPE_INFORMATION_KIOSK,
|
||||
RCT1_RIDE_TYPE_TOILETS,
|
||||
RCT1_RIDE_TYPE_FERRIS_WHEEL,
|
||||
RCT1_RIDE_TYPE_MOTION_SIMULATOR,
|
||||
RCT1_RIDE_TYPE_3D_CINEMA,
|
||||
RCT1_RIDE_TYPE_TOP_SPIN,
|
||||
RCT1_RIDE_TYPE_SPACE_RINGS,
|
||||
RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_SOUVENIR_STALL,
|
||||
RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_PIZZA_STALL,
|
||||
RCT1_RIDE_TYPE_TWIST,
|
||||
RCT1_RIDE_TYPE_HAUNTED_HOUSE,
|
||||
RCT1_RIDE_TYPE_POPCORN_STALL,
|
||||
RCT1_RIDE_TYPE_CIRCUS,
|
||||
RCT1_RIDE_TYPE_GHOST_TRAIN,
|
||||
RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_WOODEN_SIDE_FRICTION_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_STEEL_WILD_MOUSE_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_HOT_DOG_STALL,
|
||||
RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL,
|
||||
RCT1_RIDE_TYPE_HAT_STALL,
|
||||
RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL,
|
||||
RCT1_RIDE_TYPE_VIRGINIA_REEL,
|
||||
RCT1_RIDE_TYPE_RIVER_RIDE,
|
||||
RCT1_RIDE_TYPE_CYCLE_MONORAIL,
|
||||
RCT1_RIDE_TYPE_FLYING_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_SUSPENDED_MONORAIL,
|
||||
RCT1_RIDE_TYPE_40,
|
||||
RCT1_RIDE_TYPE_WOODEN_REVERSER_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_HEARTLINE_TWISTER_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_MINIATURE_GOLF,
|
||||
RCT1_RIDE_TYPE_44,
|
||||
RCT1_RIDE_TYPE_ROTO_DROP,
|
||||
RCT1_RIDE_TYPE_FLYING_SAUCERS,
|
||||
RCT1_RIDE_TYPE_CROOKED_HOUSE,
|
||||
RCT1_RIDE_TYPE_CYCLE_RAILWAY,
|
||||
RCT1_RIDE_TYPE_SUSPENDED_LOOPING_ROLLER_COASTER,
|
||||
RCT1_RIDE_TYPE_WATER_COASTER,
|
||||
RCT1_RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER,
|
||||
RCT1_RIDE_TYPE_INVERTED_WILD_MOUSE_COASTER,
|
||||
RCT1_RIDE_TYPE_JET_SKIS,
|
||||
RCT1_RIDE_TYPE_T_SHIRT_STALL,
|
||||
RCT1_RIDE_TYPE_RAFT_RIDE,
|
||||
RCT1_RIDE_TYPE_DOUGHNUT_SHOP,
|
||||
RCT1_RIDE_TYPE_ENTERPRISE,
|
||||
RCT1_RIDE_TYPE_COFFEE_SHOP,
|
||||
RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL,
|
||||
RCT1_RIDE_TYPE_LEMONADE_STALL,
|
||||
WoodenRollerCoaster = 0,
|
||||
StandUpSteelRollerCoaster,
|
||||
SuspendedRollerCoaster,
|
||||
InvertedRollerCoaster,
|
||||
SteelMiniRollerCoaster,
|
||||
MiniatureRailway,
|
||||
Monorail,
|
||||
SuspendedSingleRailRollerCoaster,
|
||||
BoatHire,
|
||||
WoodenCrazyRodentRollerCoaster,
|
||||
SingleRailRollerCoaster,
|
||||
CarRide,
|
||||
LaunchedFreefall,
|
||||
BobsledRollerCoaster,
|
||||
ObservationTower,
|
||||
SteelRollerCoaster,
|
||||
WaterSlide,
|
||||
MineTrainRollerCoaster,
|
||||
Chairlift,
|
||||
SteelCorkscrewRollerCoaster,
|
||||
HedgeMaze,
|
||||
SpiralSlide,
|
||||
GoKarts,
|
||||
LogFlume,
|
||||
RiverRapids,
|
||||
Dodgems,
|
||||
SwingingShip,
|
||||
SwingingInverterShip,
|
||||
IceCreamStall,
|
||||
ChipsStall,
|
||||
DrinkStall,
|
||||
CandyflossStall,
|
||||
BurgerBar,
|
||||
MerryGoRound,
|
||||
BalloonStall,
|
||||
InformationKiosk,
|
||||
Toilets,
|
||||
FerrisWheel,
|
||||
MotionSimulator,
|
||||
_3DCinema,
|
||||
TopSpin,
|
||||
SpaceRings,
|
||||
ReverseFreefallRollerCoaster,
|
||||
SouvenirStall,
|
||||
VerticalRollerCoaster,
|
||||
PizzaStall,
|
||||
Twist,
|
||||
HauntedHouse,
|
||||
PopcornStall,
|
||||
Circus,
|
||||
GhostTrain,
|
||||
SteelTwisterRollerCoaster,
|
||||
WoodenTwisterRollerCoaster,
|
||||
WoodenSideFrictionRollerCoaster,
|
||||
SteelWildMouseRollerCoaster,
|
||||
HotDogStall,
|
||||
ExoticSeaFoodStall,
|
||||
HatStall,
|
||||
ToffeeAppleStall,
|
||||
VirginiaReel,
|
||||
RiverRide,
|
||||
CycleMonorail,
|
||||
FlyingRollerCoaster,
|
||||
SuspendedMonorail,
|
||||
_40,
|
||||
WoodenReverseRollerCoaster,
|
||||
HeartlineTwisterRollerCoaster,
|
||||
MiniatureGolf,
|
||||
_44,
|
||||
RotoDrop,
|
||||
FlyingSaucers,
|
||||
CrookedHouse,
|
||||
CycleRailway,
|
||||
SuspendedLoopingRollerCoaster,
|
||||
WaterCoaster,
|
||||
AirPoweredVerticalCoaster,
|
||||
InvertedWildMouseCoaster,
|
||||
JetSkis,
|
||||
TShirtStall,
|
||||
RaftRide,
|
||||
DoughnutShop,
|
||||
Enterprise,
|
||||
CoffeeShop,
|
||||
FriedChickenStall,
|
||||
LemonadeStall,
|
||||
|
||||
RCT1_RIDE_TYPE_COUNT
|
||||
Count,
|
||||
Null = 255,
|
||||
};
|
||||
|
||||
#pragma pack(push, 1)
|
||||
|
|
|
@ -133,7 +133,7 @@ namespace RCT1
|
|||
EntryList _waterEntry;
|
||||
|
||||
// Lookup tables for converting from RCT1 hard coded types to the new dynamic object entries
|
||||
ObjectEntryIndex _rideTypeToRideEntryMap[EnumValue(RideType::RCT1_RIDE_TYPE_COUNT)]{};
|
||||
ObjectEntryIndex _rideTypeToRideEntryMap[EnumValue(RideType::Count)]{};
|
||||
ObjectEntryIndex _vehicleTypeToRideEntryMap[RCT1_VEHICLE_TYPE_COUNT]{};
|
||||
ObjectEntryIndex _smallSceneryTypeToEntryMap[256]{};
|
||||
ObjectEntryIndex _largeSceneryTypeToEntryMap[256]{};
|
||||
|
@ -144,7 +144,7 @@ namespace RCT1
|
|||
|
||||
// Research
|
||||
std::bitset<MAX_RIDE_OBJECTS> _researchRideEntryUsed{};
|
||||
std::bitset<EnumValue(RideType::RCT1_RIDE_TYPE_COUNT)> _researchRideTypeUsed{};
|
||||
std::bitset<EnumValue(RideType::Count)> _researchRideTypeUsed{};
|
||||
|
||||
// Scenario repository - used for determining scenario name
|
||||
IScenarioRepository* _scenarioRepository = GetScenarioRepository();
|
||||
|
@ -425,7 +425,7 @@ namespace RCT1
|
|||
{
|
||||
size_t researchListCount;
|
||||
const ResearchItem* researchList = GetResearchList(&researchListCount);
|
||||
std::bitset<EnumValue(RideType::RCT1_RIDE_TYPE_COUNT)> rideTypeInResearch = GetRideTypesPresentInResearchList(
|
||||
std::bitset<EnumValue(RideType::Count)> rideTypeInResearch = GetRideTypesPresentInResearchList(
|
||||
researchList, researchListCount);
|
||||
for (size_t i = 0; i < researchListCount; i++)
|
||||
{
|
||||
|
@ -516,7 +516,7 @@ namespace RCT1
|
|||
for (size_t i = 0; i < std::size(_s4.rides); i++)
|
||||
{
|
||||
auto ride = &_s4.rides[i];
|
||||
if (ride->type != RideType::RCT1_RIDE_TYPE_NULL)
|
||||
if (ride->type != RideType::Null)
|
||||
{
|
||||
if (RCT1::RideTypeUsesVehicles(ride->type))
|
||||
AddEntryForVehicleType(ride->type, ride->vehicle_type);
|
||||
|
@ -611,7 +611,7 @@ namespace RCT1
|
|||
auto entryIndex = _rideEntries.GetOrAddEntry(entryName);
|
||||
_vehicleTypeToRideEntryMap[vehicleType] = entryIndex;
|
||||
|
||||
if (rideType != RideType::RCT1_RIDE_TYPE_NULL)
|
||||
if (rideType != RideType::Null)
|
||||
AddEntryForRideType(rideType);
|
||||
}
|
||||
}
|
||||
|
@ -714,7 +714,7 @@ namespace RCT1
|
|||
{
|
||||
for (int32_t i = 0; i < RCT12_MAX_RIDES_IN_PARK; i++)
|
||||
{
|
||||
if (_s4.rides[i].type != RideType::RCT1_RIDE_TYPE_NULL)
|
||||
if (_s4.rides[i].type != RideType::Null)
|
||||
{
|
||||
ImportRide(GetOrAllocateRide(i), &_s4.rides[i], i);
|
||||
}
|
||||
|
@ -727,7 +727,7 @@ namespace RCT1
|
|||
dst->id = rideIndex;
|
||||
|
||||
// This is a peculiarity of this exact version number, which only Heide-Park seems to use.
|
||||
if (_s4.game_version == 110018 && src->type == RideType::RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER)
|
||||
if (_s4.game_version == 110018 && src->type == RideType::InvertedRollerCoaster)
|
||||
{
|
||||
dst->type = RIDE_TYPE_COMPACT_INVERTED_COASTER;
|
||||
}
|
||||
|
@ -875,7 +875,7 @@ namespace RCT1
|
|||
|
||||
// Only merry-go-round and dodgems had music and used
|
||||
// the same flag as synchronise stations for the option to enable it
|
||||
if (src->type == RideType::RCT1_RIDE_TYPE_MERRY_GO_ROUND || src->type == RideType::RCT1_RIDE_TYPE_DODGEMS)
|
||||
if (src->type == RideType::MerryGoRound || src->type == RideType::Dodgems)
|
||||
{
|
||||
if (src->depart_flags & RCT1_RIDE_DEPART_PLAY_MUSIC)
|
||||
{
|
||||
|
@ -1007,11 +1007,11 @@ namespace RCT1
|
|||
dst->track_colour[0].supports = RCT1::GetColour(src->track_support_colour);
|
||||
|
||||
// Balloons were always blue in the original RCT.
|
||||
if (src->type == RideType::RCT1_RIDE_TYPE_BALLOON_STALL)
|
||||
if (src->type == RideType::BalloonStall)
|
||||
{
|
||||
dst->track_colour[0].main = COLOUR_LIGHT_BLUE;
|
||||
}
|
||||
else if (src->type == RideType::RCT1_RIDE_TYPE_RIVER_RAPIDS)
|
||||
else if (src->type == RideType::RiverRapids)
|
||||
{
|
||||
dst->track_colour[0].main = COLOUR_WHITE;
|
||||
}
|
||||
|
@ -2052,10 +2052,10 @@ namespace RCT1
|
|||
}
|
||||
}
|
||||
|
||||
static std::bitset<EnumValue(RideType::RCT1_RIDE_TYPE_COUNT)> GetRideTypesPresentInResearchList(
|
||||
static std::bitset<EnumValue(RideType::Count)> GetRideTypesPresentInResearchList(
|
||||
const RCT1::ResearchItem* researchList, size_t researchListCount)
|
||||
{
|
||||
std::bitset<EnumValue(RideType::RCT1_RIDE_TYPE_COUNT)> ret = {};
|
||||
std::bitset<EnumValue(RideType::Count)> ret = {};
|
||||
|
||||
for (size_t i = 0; i < researchListCount; i++)
|
||||
{
|
||||
|
|
|
@ -124,10 +124,10 @@ namespace RCT1
|
|||
// Mazes were only hedges
|
||||
switch (td4.type)
|
||||
{
|
||||
case RideType::RCT1_RIDE_TYPE_HEDGE_MAZE:
|
||||
case RideType::HedgeMaze:
|
||||
td->track_support_colour[i] = MAZE_WALL_TYPE_HEDGE;
|
||||
break;
|
||||
case RideType::RCT1_RIDE_TYPE_RIVER_RAPIDS:
|
||||
case RideType::RiverRapids:
|
||||
td->track_spine_colour[i] = COLOUR_WHITE;
|
||||
td->track_rail_colour[i] = COLOUR_WHITE;
|
||||
break;
|
||||
|
@ -150,7 +150,7 @@ namespace RCT1
|
|||
|
||||
// Convert RCT1 vehicle type to RCT2 vehicle type. Initialise with a string consisting of 8 spaces.
|
||||
rct_object_entry vehicleObject = { 0x80, " " };
|
||||
if (td4Base.type == RideType::RCT1_RIDE_TYPE_HEDGE_MAZE)
|
||||
if (td4Base.type == RideType::HedgeMaze)
|
||||
{
|
||||
const char* vehObjName = RCT1::GetRideTypeObject(td4Base.type);
|
||||
assert(vehObjName != nullptr);
|
||||
|
|
|
@ -177,9 +177,9 @@ namespace RCT1
|
|||
|
||||
uint8_t GetRideType(RideType rideType, uint8_t vehicleType)
|
||||
{
|
||||
if (rideType == RideType::RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER && vehicleType == RCT1_VEHICLE_TYPE_NON_LOOPING_STEEL_TWISTER_ROLLER_COASTER_TRAIN)
|
||||
if (rideType == RideType::SteelTwisterRollerCoaster && vehicleType == RCT1_VEHICLE_TYPE_NON_LOOPING_STEEL_TWISTER_ROLLER_COASTER_TRAIN)
|
||||
return RIDE_TYPE_HYPER_TWISTER;
|
||||
if (rideType == RideType::RCT1_RIDE_TYPE_STEEL_CORKSCREW_ROLLER_COASTER && vehicleType == RCT1_VEHICLE_TYPE_HYPERCOASTER_TRAIN)
|
||||
if (rideType == RideType::SteelCorkscrewRollerCoaster && vehicleType == RCT1_VEHICLE_TYPE_HYPERCOASTER_TRAIN)
|
||||
return RIDE_TYPE_HYPERCOASTER;
|
||||
|
||||
static uint8_t map[] =
|
||||
|
@ -379,30 +379,30 @@ namespace RCT1
|
|||
bool RideTypeUsesVehicles(RideType rideType)
|
||||
{
|
||||
switch (rideType) {
|
||||
case RideType::RCT1_RIDE_TYPE_HEDGE_MAZE:
|
||||
case RideType::RCT1_RIDE_TYPE_SPIRAL_SLIDE:
|
||||
case RideType::RCT1_RIDE_TYPE_ICE_CREAM_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_CHIPS_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_DRINK_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_CANDYFLOSS_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_BURGER_BAR:
|
||||
case RideType::RCT1_RIDE_TYPE_BALLOON_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_INFORMATION_KIOSK:
|
||||
case RideType::RCT1_RIDE_TYPE_TOILETS:
|
||||
case RideType::RCT1_RIDE_TYPE_SOUVENIR_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_PIZZA_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_POPCORN_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_HOT_DOG_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_HAT_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_40:
|
||||
case RideType::RCT1_RIDE_TYPE_44:
|
||||
case RideType::RCT1_RIDE_TYPE_T_SHIRT_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_DOUGHNUT_SHOP:
|
||||
case RideType::RCT1_RIDE_TYPE_COFFEE_SHOP:
|
||||
case RideType::RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL:
|
||||
case RideType::RCT1_RIDE_TYPE_LEMONADE_STALL:
|
||||
case RideType::HedgeMaze:
|
||||
case RideType::SpiralSlide:
|
||||
case RideType::IceCreamStall:
|
||||
case RideType::ChipsStall:
|
||||
case RideType::DrinkStall:
|
||||
case RideType::CandyflossStall:
|
||||
case RideType::BurgerBar:
|
||||
case RideType::BalloonStall:
|
||||
case RideType::InformationKiosk:
|
||||
case RideType::Toilets:
|
||||
case RideType::SouvenirStall:
|
||||
case RideType::PizzaStall:
|
||||
case RideType::PopcornStall:
|
||||
case RideType::HotDogStall:
|
||||
case RideType::ExoticSeaFoodStall:
|
||||
case RideType::HatStall:
|
||||
case RideType::ToffeeAppleStall:
|
||||
case RideType::_40:
|
||||
case RideType::_44:
|
||||
case RideType::TShirtStall:
|
||||
case RideType::DoughnutShop:
|
||||
case RideType::CoffeeShop:
|
||||
case RideType::FriedChickenStall:
|
||||
case RideType::LemonadeStall:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
|
|
Loading…
Reference in New Issue