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

Rename enum members

This commit is contained in:
ζeh Matt 2021-09-03 23:48:35 +03:00
parent af99bc28c7
commit 481f7565dc
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
4 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
src/openrct2/rct1/RCT1.h
View File

@ -36,94 +36,94 @@ namespace RCT1
enum class RideType : uint8_t enum class RideType : uint8_t
{ {
RCT1_RIDE_TYPE_NULL = 255, WoodenRollerCoaster = 0,
RCT1_RIDE_TYPE_WOODEN_ROLLER_COASTER = 0, StandUpSteelRollerCoaster,
RCT1_RIDE_TYPE_STAND_UP_STEEL_ROLLER_COASTER, SuspendedRollerCoaster,
RCT1_RIDE_TYPE_SUSPENDED_ROLLER_COASTER, InvertedRollerCoaster,
RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER, SteelMiniRollerCoaster,
RCT1_RIDE_TYPE_STEEL_MINI_ROLLER_COASTER, MiniatureRailway,
RCT1_RIDE_TYPE_MINIATURE_RAILWAY, Monorail,
RCT1_RIDE_TYPE_MONORAIL, SuspendedSingleRailRollerCoaster,
RCT1_RIDE_TYPE_SUSPENDED_SINGLE_RAIL_ROLLER_COASTER, BoatHire,
RCT1_RIDE_TYPE_BOAT_HIRE, WoodenCrazyRodentRollerCoaster,
RCT1_RIDE_TYPE_WOODEN_CRAZY_RODENT_ROLLER_COASTER, SingleRailRollerCoaster,
RCT1_RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER, CarRide,
RCT1_RIDE_TYPE_CAR_RIDE, LaunchedFreefall,
RCT1_RIDE_TYPE_LAUNCHED_FREEFALL, BobsledRollerCoaster,
RCT1_RIDE_TYPE_BOBSLED_ROLLER_COASTER, ObservationTower,
RCT1_RIDE_TYPE_OBSERVATION_TOWER, SteelRollerCoaster,
RCT1_RIDE_TYPE_STEEL_ROLLER_COASTER, WaterSlide,
RCT1_RIDE_TYPE_WATER_SLIDE, MineTrainRollerCoaster,
RCT1_RIDE_TYPE_MINE_TRAIN_ROLLER_COASTER, Chairlift,
RCT1_RIDE_TYPE_CHAIRLIFT, SteelCorkscrewRollerCoaster,
RCT1_RIDE_TYPE_STEEL_CORKSCREW_ROLLER_COASTER, HedgeMaze,
RCT1_RIDE_TYPE_HEDGE_MAZE, SpiralSlide,
RCT1_RIDE_TYPE_SPIRAL_SLIDE, GoKarts,
RCT1_RIDE_TYPE_GO_KARTS, LogFlume,
RCT1_RIDE_TYPE_LOG_FLUME, RiverRapids,
RCT1_RIDE_TYPE_RIVER_RAPIDS, Dodgems,
RCT1_RIDE_TYPE_DODGEMS, SwingingShip,
RCT1_RIDE_TYPE_SWINGING_SHIP, SwingingInverterShip,
RCT1_RIDE_TYPE_SWINGING_INVERTER_SHIP, IceCreamStall,
RCT1_RIDE_TYPE_ICE_CREAM_STALL, ChipsStall,
RCT1_RIDE_TYPE_CHIPS_STALL, DrinkStall,
RCT1_RIDE_TYPE_DRINK_STALL, CandyflossStall,
RCT1_RIDE_TYPE_CANDYFLOSS_STALL, BurgerBar,
RCT1_RIDE_TYPE_BURGER_BAR, MerryGoRound,
RCT1_RIDE_TYPE_MERRY_GO_ROUND, BalloonStall,
RCT1_RIDE_TYPE_BALLOON_STALL, InformationKiosk,
RCT1_RIDE_TYPE_INFORMATION_KIOSK, Toilets,
RCT1_RIDE_TYPE_TOILETS, FerrisWheel,
RCT1_RIDE_TYPE_FERRIS_WHEEL, MotionSimulator,
RCT1_RIDE_TYPE_MOTION_SIMULATOR, _3DCinema,
RCT1_RIDE_TYPE_3D_CINEMA, TopSpin,
RCT1_RIDE_TYPE_TOP_SPIN, SpaceRings,
RCT1_RIDE_TYPE_SPACE_RINGS, ReverseFreefallRollerCoaster,
RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER, SouvenirStall,
RCT1_RIDE_TYPE_SOUVENIR_STALL, VerticalRollerCoaster,
RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER, PizzaStall,
RCT1_RIDE_TYPE_PIZZA_STALL, Twist,
RCT1_RIDE_TYPE_TWIST, HauntedHouse,
RCT1_RIDE_TYPE_HAUNTED_HOUSE, PopcornStall,
RCT1_RIDE_TYPE_POPCORN_STALL, Circus,
RCT1_RIDE_TYPE_CIRCUS, GhostTrain,
RCT1_RIDE_TYPE_GHOST_TRAIN, SteelTwisterRollerCoaster,
RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER, WoodenTwisterRollerCoaster,
RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER, WoodenSideFrictionRollerCoaster,
RCT1_RIDE_TYPE_WOODEN_SIDE_FRICTION_ROLLER_COASTER, SteelWildMouseRollerCoaster,
RCT1_RIDE_TYPE_STEEL_WILD_MOUSE_ROLLER_COASTER, HotDogStall,
RCT1_RIDE_TYPE_HOT_DOG_STALL, ExoticSeaFoodStall,
RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL, HatStall,
RCT1_RIDE_TYPE_HAT_STALL, ToffeeAppleStall,
RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL, VirginiaReel,
RCT1_RIDE_TYPE_VIRGINIA_REEL, RiverRide,
RCT1_RIDE_TYPE_RIVER_RIDE, CycleMonorail,
RCT1_RIDE_TYPE_CYCLE_MONORAIL, FlyingRollerCoaster,
RCT1_RIDE_TYPE_FLYING_ROLLER_COASTER, SuspendedMonorail,
RCT1_RIDE_TYPE_SUSPENDED_MONORAIL, _40,
RCT1_RIDE_TYPE_40, WoodenReverseRollerCoaster,
RCT1_RIDE_TYPE_WOODEN_REVERSER_ROLLER_COASTER, HeartlineTwisterRollerCoaster,
RCT1_RIDE_TYPE_HEARTLINE_TWISTER_ROLLER_COASTER, MiniatureGolf,
RCT1_RIDE_TYPE_MINIATURE_GOLF, _44,
RCT1_RIDE_TYPE_44, RotoDrop,
RCT1_RIDE_TYPE_ROTO_DROP, FlyingSaucers,
RCT1_RIDE_TYPE_FLYING_SAUCERS, CrookedHouse,
RCT1_RIDE_TYPE_CROOKED_HOUSE, CycleRailway,
RCT1_RIDE_TYPE_CYCLE_RAILWAY, SuspendedLoopingRollerCoaster,
RCT1_RIDE_TYPE_SUSPENDED_LOOPING_ROLLER_COASTER, WaterCoaster,
RCT1_RIDE_TYPE_WATER_COASTER, AirPoweredVerticalCoaster,
RCT1_RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER, InvertedWildMouseCoaster,
RCT1_RIDE_TYPE_INVERTED_WILD_MOUSE_COASTER, JetSkis,
RCT1_RIDE_TYPE_JET_SKIS, TShirtStall,
RCT1_RIDE_TYPE_T_SHIRT_STALL, RaftRide,
RCT1_RIDE_TYPE_RAFT_RIDE, DoughnutShop,
RCT1_RIDE_TYPE_DOUGHNUT_SHOP, Enterprise,
RCT1_RIDE_TYPE_ENTERPRISE, CoffeeShop,
RCT1_RIDE_TYPE_COFFEE_SHOP, FriedChickenStall,
RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL, LemonadeStall,
RCT1_RIDE_TYPE_LEMONADE_STALL,
RCT1_RIDE_TYPE_COUNT Count,
Null = 255,
}; };
#pragma pack(push, 1) #pragma pack(push, 1)

24
src/openrct2/rct1/S4Importer.cpp
View File

@ -133,7 +133,7 @@ namespace RCT1
EntryList _waterEntry; EntryList _waterEntry;
// Lookup tables for converting from RCT1 hard coded types to the new dynamic object entries // 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 _vehicleTypeToRideEntryMap[RCT1_VEHICLE_TYPE_COUNT]{};
ObjectEntryIndex _smallSceneryTypeToEntryMap[256]{}; ObjectEntryIndex _smallSceneryTypeToEntryMap[256]{};
ObjectEntryIndex _largeSceneryTypeToEntryMap[256]{}; ObjectEntryIndex _largeSceneryTypeToEntryMap[256]{};
@ -144,7 +144,7 @@ namespace RCT1
// Research // Research
std::bitset<MAX_RIDE_OBJECTS> _researchRideEntryUsed{}; 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 // Scenario repository - used for determining scenario name
IScenarioRepository* _scenarioRepository = GetScenarioRepository(); IScenarioRepository* _scenarioRepository = GetScenarioRepository();
@ -425,7 +425,7 @@ namespace RCT1
{ {
size_t researchListCount; size_t researchListCount;
const ResearchItem* researchList = GetResearchList(&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); researchList, researchListCount);
for (size_t i = 0; i < researchListCount; i++) 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++) for (size_t i = 0; i < std::size(_s4.rides); i++)
{ {
auto ride = &_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)) if (RCT1::RideTypeUsesVehicles(ride->type))
AddEntryForVehicleType(ride->type, ride->vehicle_type); AddEntryForVehicleType(ride->type, ride->vehicle_type);
@ -611,7 +611,7 @@ namespace RCT1
auto entryIndex = _rideEntries.GetOrAddEntry(entryName); auto entryIndex = _rideEntries.GetOrAddEntry(entryName);
_vehicleTypeToRideEntryMap[vehicleType] = entryIndex; _vehicleTypeToRideEntryMap[vehicleType] = entryIndex;
if (rideType != RideType::RCT1_RIDE_TYPE_NULL) if (rideType != RideType::Null)
AddEntryForRideType(rideType); AddEntryForRideType(rideType);
} }
} }
@ -714,7 +714,7 @@ namespace RCT1
{ {
for (int32_t i = 0; i < RCT12_MAX_RIDES_IN_PARK; i++) 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); ImportRide(GetOrAllocateRide(i), &_s4.rides[i], i);
} }
@ -727,7 +727,7 @@ namespace RCT1
dst->id = rideIndex; dst->id = rideIndex;
// This is a peculiarity of this exact version number, which only Heide-Park seems to use. // 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; dst->type = RIDE_TYPE_COMPACT_INVERTED_COASTER;
} }
@ -875,7 +875,7 @@ namespace RCT1
// Only merry-go-round and dodgems had music and used // Only merry-go-round and dodgems had music and used
// the same flag as synchronise stations for the option to enable it // 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) 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); dst->track_colour[0].supports = RCT1::GetColour(src->track_support_colour);
// Balloons were always blue in the original RCT. // 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; 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; 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) 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++) for (size_t i = 0; i < researchListCount; i++)
{ {

6
src/openrct2/rct1/T4Importer.cpp
View File

@ -124,10 +124,10 @@ namespace RCT1
// Mazes were only hedges // Mazes were only hedges
switch (td4.type) switch (td4.type)
{ {
case RideType::RCT1_RIDE_TYPE_HEDGE_MAZE: case RideType::HedgeMaze:
td->track_support_colour[i] = MAZE_WALL_TYPE_HEDGE; td->track_support_colour[i] = MAZE_WALL_TYPE_HEDGE;
break; break;
case RideType::RCT1_RIDE_TYPE_RIVER_RAPIDS: case RideType::RiverRapids:
td->track_spine_colour[i] = COLOUR_WHITE; td->track_spine_colour[i] = COLOUR_WHITE;
td->track_rail_colour[i] = COLOUR_WHITE; td->track_rail_colour[i] = COLOUR_WHITE;
break; break;
@ -150,7 +150,7 @@ namespace RCT1
// Convert RCT1 vehicle type to RCT2 vehicle type. Initialise with a string consisting of 8 spaces. // Convert RCT1 vehicle type to RCT2 vehicle type. Initialise with a string consisting of 8 spaces.
rct_object_entry vehicleObject = { 0x80, " " }; 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); const char* vehObjName = RCT1::GetRideTypeObject(td4Base.type);
assert(vehObjName != nullptr); assert(vehObjName != nullptr);

52
src/openrct2/rct1/Tables.cpp
View File

@ -177,9 +177,9 @@ namespace RCT1
uint8_t GetRideType(RideType rideType, uint8_t vehicleType) 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; 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; return RIDE_TYPE_HYPERCOASTER;
static uint8_t map[] = static uint8_t map[] =
@ -379,30 +379,30 @@ namespace RCT1
bool RideTypeUsesVehicles(RideType rideType) bool RideTypeUsesVehicles(RideType rideType)
{ {
switch (rideType) { switch (rideType) {
case RideType::RCT1_RIDE_TYPE_HEDGE_MAZE: case RideType::HedgeMaze:
case RideType::RCT1_RIDE_TYPE_SPIRAL_SLIDE: case RideType::SpiralSlide:
case RideType::RCT1_RIDE_TYPE_ICE_CREAM_STALL: case RideType::IceCreamStall:
case RideType::RCT1_RIDE_TYPE_CHIPS_STALL: case RideType::ChipsStall:
case RideType::RCT1_RIDE_TYPE_DRINK_STALL: case RideType::DrinkStall:
case RideType::RCT1_RIDE_TYPE_CANDYFLOSS_STALL: case RideType::CandyflossStall:
case RideType::RCT1_RIDE_TYPE_BURGER_BAR: case RideType::BurgerBar:
case RideType::RCT1_RIDE_TYPE_BALLOON_STALL: case RideType::BalloonStall:
case RideType::RCT1_RIDE_TYPE_INFORMATION_KIOSK: case RideType::InformationKiosk:
case RideType::RCT1_RIDE_TYPE_TOILETS: case RideType::Toilets:
case RideType::RCT1_RIDE_TYPE_SOUVENIR_STALL: case RideType::SouvenirStall:
case RideType::RCT1_RIDE_TYPE_PIZZA_STALL: case RideType::PizzaStall:
case RideType::RCT1_RIDE_TYPE_POPCORN_STALL: case RideType::PopcornStall:
case RideType::RCT1_RIDE_TYPE_HOT_DOG_STALL: case RideType::HotDogStall:
case RideType::RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL: case RideType::ExoticSeaFoodStall:
case RideType::RCT1_RIDE_TYPE_HAT_STALL: case RideType::HatStall:
case RideType::RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL: case RideType::ToffeeAppleStall:
case RideType::RCT1_RIDE_TYPE_40: case RideType::_40:
case RideType::RCT1_RIDE_TYPE_44: case RideType::_44:
case RideType::RCT1_RIDE_TYPE_T_SHIRT_STALL: case RideType::TShirtStall:
case RideType::RCT1_RIDE_TYPE_DOUGHNUT_SHOP: case RideType::DoughnutShop:
case RideType::RCT1_RIDE_TYPE_COFFEE_SHOP: case RideType::CoffeeShop:
case RideType::RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL: case RideType::FriedChickenStall:
case RideType::RCT1_RIDE_TYPE_LEMONADE_STALL: case RideType::LemonadeStall:
return false; return false;
default: default:
return true; return true;