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

Close #19214: Use consistent casing for RC and RCT (#19230)

This commit is contained in:
Michael Steenbeek 2023-01-20 09:19:14 +01:00 committed by GitHub
parent 9deed6d98a
commit cf9aad7885
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 2421 additions and 2421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Options.cpp
View File

@ -1360,7 +1360,7 @@ private:
ShowDropdown(widget, numItems);
if (gConfigSound.TitleMusic == TitleMusicKind::None)
Dropdown::SetChecked(0, true);
else if (gConfigSound.TitleMusic == TitleMusicKind::Rct2)
else if (gConfigSound.TitleMusic == TitleMusicKind::RCT2)
Dropdown::SetChecked(1, true);
}
else
@ -1410,7 +1410,7 @@ private:
auto titleMusic = static_cast<TitleMusicKind>(dropdownIndex);
if (!IsRCT1TitleMusicAvailable() && dropdownIndex != 0)
{
titleMusic = TitleMusicKind::Rct2;
titleMusic = TitleMusicKind::RCT2;
}
gConfigSound.TitleMusic = titleMusic;

10
src/openrct2/PlatformEnvironment.cpp
View File

@ -22,7 +22,7 @@ class PlatformEnvironment final : public IPlatformEnvironment
{
private:
u8string _basePath[DIRBASE_COUNT];
bool _usingRctClassic{};
bool _usingRCTClassic{};
public:
explicit PlatformEnvironment(DIRBASE_VALUES basePaths)
@ -49,7 +49,7 @@ public:
directoryName = DirectoryNamesRCT2[static_cast<size_t>(did)];
break;
case DIRBASE::RCT2:
directoryName = _usingRctClassic ? "Assets" : DirectoryNamesRCT2[static_cast<size_t>(did)];
directoryName = _usingRCTClassic ? "Assets" : DirectoryNamesRCT2[static_cast<size_t>(did)];
break;
case DIRBASE::OPENRCT2:
case DIRBASE::USER:
@ -74,7 +74,7 @@ public:
auto dataPath = GetDirectoryPath(base, did);
std::string alternativeFilename;
if (_usingRctClassic && base == DIRBASE::RCT2 && did == DIRID::DATA)
if (_usingRCTClassic && base == DIRBASE::RCT2 && did == DIRID::DATA)
{
// Special case, handle RCT Classic css ogg files
if (String::StartsWith(fileName, "css", true) && String::EndsWith(fileName, ".dat", true))
@ -106,13 +106,13 @@ public:
if (base == DIRBASE::RCT2)
{
_usingRctClassic = Platform::IsRCTClassicPath(path);
_usingRCTClassic = Platform::IsRCTClassicPath(path);
}
}
bool IsUsingClassic() const override
{
return _usingRctClassic;
return _usingRCTClassic;
}
private:

16
src/openrct2/audio/Audio.cpp
View File

@ -107,7 +107,7 @@ namespace OpenRCT2::Audio
auto env = GetContext()->GetPlatformEnvironment();
if (env->IsUsingClassic())
{
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2cBase);
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::RCTCBase);
if (baseAudio != nullptr)
{
_soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
@ -117,7 +117,7 @@ namespace OpenRCT2::Audio
if (baseAudio == nullptr)
{
// Fallback to vanilla RCT2 audio object
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2Base);
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::RCT2Base);
if (baseAudio != nullptr)
{
_soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
@ -127,7 +127,7 @@ namespace OpenRCT2::Audio
objManager.LoadObject(AudioObjectIdentifiers::OpenRCT2Additional);
_soundsAdditionalAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(
AudioObjectIdentifiers::OpenRCT2Additional);
objManager.LoadObject(AudioObjectIdentifiers::Rct2Circus);
objManager.LoadObject(AudioObjectIdentifiers::RCT2Circus);
}
void PopulateDevices()
@ -275,14 +275,14 @@ namespace OpenRCT2::Audio
{
default:
return {};
case TitleMusicKind::Rct1:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::Rct1Title);
case TitleMusicKind::Rct2:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::Rct2Title);
case TitleMusicKind::RCT1:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::RCT1Title);
case TitleMusicKind::RCT2:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::RCT2Title);
case TitleMusicKind::Random:
return ObjectEntryDescriptor(
ObjectType::Audio,
(UtilRand() & 1) ? AudioObjectIdentifiers::Rct1Title : AudioObjectIdentifiers::Rct2Title);
(UtilRand() & 1) ? AudioObjectIdentifiers::RCT1Title : AudioObjectIdentifiers::RCT2Title);
}
}

10
src/openrct2/audio/audio.h
View File

@ -137,11 +137,11 @@ namespace OpenRCT2::Audio
namespace AudioObjectIdentifiers
{
constexpr std::string_view Rct1Title = "rct1.audio.title";
constexpr std::string_view Rct2Base = "rct2.audio.base";
constexpr std::string_view Rct2cBase = "rct2.audio.base.rctc";
constexpr std::string_view Rct2Title = "rct2.audio.title";
constexpr std::string_view Rct2Circus = "rct2.audio.circus";
constexpr std::string_view RCT1Title = "rct1.audio.title";
constexpr std::string_view RCT2Base = "rct2.audio.base";
constexpr std::string_view RCTCBase = "rct2.audio.base.rctc";
constexpr std::string_view RCT2Title = "rct2.audio.title";
constexpr std::string_view RCT2Circus = "rct2.audio.circus";
constexpr std::string_view OpenRCT2Additional = "openrct2.audio.additional";
} // namespace AudioObjectIdentifiers

2
src/openrct2/config/Config.cpp
View File

@ -362,7 +362,7 @@ namespace Config
model->Device = reader->GetString("audio_device", "");
model->MasterSoundEnabled = reader->GetBoolean("master_sound", true);
model->MasterVolume = reader->GetInt32("master_volume", 100);
model->TitleMusic = static_cast<TitleMusicKind>(reader->GetInt32("title_music", EnumValue(TitleMusicKind::Rct2)));
model->TitleMusic = static_cast<TitleMusicKind>(reader->GetInt32("title_music", EnumValue(TitleMusicKind::RCT2)));
model->SoundEnabled = reader->GetBoolean("sound", true);
model->SoundVolume = reader->GetInt32("sound_volume", 100);
model->RideMusicEnabled = reader->GetBoolean("ride_music", true);

4
src/openrct2/config/Config.h
View File

@ -251,8 +251,8 @@ enum class MeasurementFormat : int32_t
enum class TitleMusicKind : int32_t
{
None,
Rct1,
Rct2,
RCT1,
RCT2,
Random
};

4
src/openrct2/core/Random.hpp
View File

@ -186,10 +186,10 @@ namespace Random
}
};
namespace Rct2
namespace RCT2
{
using Engine = RotateEngine<uint32_t, 0x1234567F, 7, 3>;
using Seed = FixedSeedSequence<2>;
using State = Engine::state_type;
} // namespace Rct2
} // namespace RCT2
} // namespace Random

4
src/openrct2/object/ObjectFactory.cpp
View File

@ -518,8 +518,8 @@ namespace ObjectFactory
auto id = Json::GetString(jRoot["id"]);
// HACK Disguise RCT Classic audio as RCT2 audio so asset packs override correctly
if (id == OpenRCT2::Audio::AudioObjectIdentifiers::Rct2cBase)
id = OpenRCT2::Audio::AudioObjectIdentifiers::Rct2Base;
if (id == OpenRCT2::Audio::AudioObjectIdentifiers::RCTCBase)
id = OpenRCT2::Audio::AudioObjectIdentifiers::RCT2Base;
auto version = VersionTuple(Json::GetString(jRoot["version"]));
ObjectEntryDescriptor descriptor;

2
src/openrct2/park/ParkFile.cpp
View File

@ -486,7 +486,7 @@ namespace OpenRCT2
uint32_t s0{}, s1{};
cs.ReadWrite(s0);
cs.ReadWrite(s1);
Random::Rct2::Seed s{ s0, s1 };
Random::RCT2::Seed s{ s0, s1 };
gScenarioRand.seed(s);
}
else

2
src/openrct2/ride/RideAudio.cpp
View File

@ -187,7 +187,7 @@ namespace OpenRCT2::RideAudio
void CircusStartRideMusicChannel(const ViewportRideMusicInstance& instance)
{
auto& objManager = GetContext()->GetObjectManager();
ObjectEntryDescriptor desc(ObjectType::Audio, AudioObjectIdentifiers::Rct2Circus);
ObjectEntryDescriptor desc(ObjectType::Audio, AudioObjectIdentifiers::RCT2Circus);
auto audioObj = static_cast<AudioObject*>(objManager.GetLoadedObject(desc));
if (audioObj != nullptr)
{

50
src/openrct2/ride/TrackPaint.h
View File

@ -401,25 +401,25 @@ using TRACK_PAINT_FUNCTION = void (*)(
const TrackElement& trackElement);
using TRACK_PAINT_FUNCTION_GETTER = TRACK_PAINT_FUNCTION (*)(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionStandUpRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedSwingingRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionJuniorRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionStandUpRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedSwingingRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionJuniorRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMonorail(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniSuspendedRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniSuspendedRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniatureRailway(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionBoatHire(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWoodenWildMouse(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSteeplechase(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCarRide(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLaunchedFreefall(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionBobsleighRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionBobsleighRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionObservationTower(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLoopingRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLoopingRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionDinghySlide(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMineTrainRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMineTrainRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionChairlift(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCorkscrewRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCorkscrewRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMaze(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSpiralSlide(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGoKarts(int32_t trackType);
@ -433,7 +433,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionMotionsimulator(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunction3dCinema(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionTopspin(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSpaceRings(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverseFreefallRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverseFreefallRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLift(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionShop(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMerryGoRound(int32_t trackType);
@ -442,35 +442,35 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionTwist(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionHauntedHouse(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCircus(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGhostTrain(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSideFrictionRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWoodenRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSideFrictionRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWoodenRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWildMouse(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMultiDimensionRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMultiDimensionRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionVirginiaReel(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSplashBoats(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniHelicopters(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLayDownRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLayDownRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedMonorail(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverserRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionHeartlineTwisterRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverserRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionHeartlineTwisterRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniGolf(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionRotoDrop(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingSaucers(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCrookedHouse(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMonorailCycles(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCompactInvertedRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCompactInvertedRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionAirPoweredVerticalRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedHairpinRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedHairpinRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMagicCarpet(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSubmarineRide(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionEnterprise(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedImpulseRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedImpulseRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniRC(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMineRide(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLimLaunchedRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLimLaunchedRC(int32_t trackType);
namespace HybridRC
{
TRACK_PAINT_FUNCTION GetTrackPaintFunction(int32_t trackType);
@ -483,4 +483,4 @@ namespace AlpineRC
{
TRACK_PAINT_FUNCTION GetTrackPaintFunction(int32_t trackType);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRc(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRC(int32_t trackType);

2
src/openrct2/ride/coaster/BobsleighCoaster.cpp
View File

@ -3867,7 +3867,7 @@ static void BobsleighRCTrackOnRidePhoto(
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionBobsleighRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionBobsleighRC(int32_t trackType)
{
switch (trackType)
{

6
src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp
View File

@ -1854,11 +1854,11 @@ static void ClassicWoodenRCTrackDiag25DegDownToRightBank(
// Stylistically, this coaster is _very_ similar to the regular Wooden Roller Coaster.
// The only difference is to which parts the colours are applied, and the degree of the banking.
// As such, all non-banked pieces are simply drawn as regular wooden roller coaster pieces with a different paint scheme.
TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRC(int32_t trackType)
{
if (!IsCsgLoaded())
{
return GetTrackPaintFunctionClassicWoodenRcFallback(trackType);
return GetTrackPaintFunctionClassicWoodenRCFallback(trackType);
}
switch (trackType)
@ -1937,5 +1937,5 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRc(int32_t trackType)
return ClassicWoodenRCTrackDiagRightBank;
}
return GetTrackPaintFunctionClassicWoodenRcFallback(trackType);
return GetTrackPaintFunctionClassicWoodenRCFallback(trackType);
}

2
src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
View File

@ -8867,7 +8867,7 @@ static void CompactInvertedRCTrackBlockBrakes(
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCompactInvertedRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCompactInvertedRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
View File

@ -9424,7 +9424,7 @@ static void CorkscrewRCTrackRightTwistUpToDown(
}
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCorkscrewRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCorkscrewRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
View File

@ -18683,7 +18683,7 @@ static void FlyingRCTrackRightFlyingLargeHalfLoopUninvertedDown(
FlyingRCTrackRightFlyingLargeHalfLoopInvertedUp(session, ride, 6 - trackSequence, direction, height, trackElement);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/GigaCoaster.cpp
View File

@ -9380,7 +9380,7 @@ static void GigaRCTrackBooster(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
View File

@ -1750,7 +1750,7 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll(
}
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionHeartlineTwisterRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionHeartlineTwisterRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
View File

@ -1357,7 +1357,7 @@ static void InvertedHairpinRCTrackBlockBrakes(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedHairpinRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedHairpinRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
View File

@ -755,7 +755,7 @@ static void InvertedImpulseRCTrackRightQuarterTurn190DegDown(
InvertedImpulseRCTrackLeftQuarterTurn190DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedImpulseRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedImpulseRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
View File

@ -10508,7 +10508,7 @@ static void InvertedRCTrackBooster(
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionInvertedRC(int32_t trackType)
{
switch (trackType)
{

588
src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

58
src/openrct2/ride/coaster/JuniorRollerCoaster.h
View File

@ -11,7 +11,7 @@
#include "../../common.h"
enum class JuniorRcChainType : uint8_t
enum class JuniorRCChainType : uint8_t
{
None,
FrictionWheels,
@ -28,88 +28,88 @@ void JuniorRCPaintStation(
void JuniorRCPaintTrackFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrack25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrack60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackFlatTo25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrack25DegUpTo60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrack60DegUpTo25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrack25DegUpToFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackLeftQuarterTurn5Tiles25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackRightQuarterTurn5Tiles25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackRightQuarterTurn3Tiles25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackRightQuarterTurn3Tiles25DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiagFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiagFlatTo25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiagFlatTo60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag25DegUpTo60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag60DegUpTo25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag25DegUpToFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag60DegUpToFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag25DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag60DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiagFlatTo25DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiagFlatTo60DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag25DegDownTo60DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag60DegDownTo25DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag25DegDownToFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);
void JuniorRCPaintTrackDiag60DegDownToFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, uint16_t height,
const TrackElement& trackElement, JuniorRcChainType chainType);
const TrackElement& trackElement, JuniorRCChainType chainType);

4
src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
View File

@ -16078,7 +16078,7 @@ static void LayDownRCTrackHalfLoopUninvertedDown(
LayDownRCTrackHalfLoopInvertedUp(session, ride, 3 - trackSequence, direction, height, trackElement);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLayDownRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLayDownRC(int32_t trackType)
{
switch (trackType)
{
@ -16315,5 +16315,5 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionLayDownRc(int32_t trackType)
case TrackElemType::FlyerHalfLoopUninvertedDown:
return LayDownRCTrackHalfLoopUninvertedDown;
}
return GetTrackPaintFunctionCorkscrewRc(trackType);
return GetTrackPaintFunctionCorkscrewRC(trackType);
}

4
src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
View File

@ -5685,7 +5685,7 @@ static void LimLaunchedRCTrackBooster(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLimLaunchedRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLimLaunchedRC(int32_t trackType)
{
switch (trackType)
{
@ -5819,7 +5819,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionLimLaunchedRc(int32_t trackType)
case TrackElemType::FlatToRightBankedDown25:
case TrackElemType::LeftBankedDown25ToFlat:
case TrackElemType::RightBankedDown25ToFlat:
return GetTrackPaintFunctionLoopingRc(trackType);
return GetTrackPaintFunctionLoopingRC(trackType);
case TrackElemType::EndStation:
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:

4
src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
View File

@ -9617,7 +9617,7 @@ static void LoopingRCTrackBooster(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLoopingRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionLoopingRC(int32_t trackType)
{
switch (trackType)
{
@ -9895,5 +9895,5 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionLoopingRc(int32_t trackType)
case TrackElemType::Booster:
return LoopingRCTrackBooster;
}
return GetTrackPaintFunctionLimLaunchedRc(trackType);
return GetTrackPaintFunctionLimLaunchedRC(trackType);
}

2
src/openrct2/ride/coaster/MineTrainCoaster.cpp
View File

@ -7511,7 +7511,7 @@ static void MineTrainRCTrackBlockBrakes(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMineTrainRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMineTrainRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/MiniRollerCoaster.cpp
View File

@ -9406,7 +9406,7 @@ static void MiniRCTrackBooster(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
View File

@ -2506,7 +2506,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
}
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniSuspendedRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniSuspendedRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
View File

@ -13071,7 +13071,7 @@ static void MultiDimensionRCTrackMultidimInverted90DegUpToFlatQuarterLoop(
}
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMultiDimensionRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionMultiDimensionRC(int32_t trackType)
{
switch (trackType)
{

22
src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
View File

@ -195,7 +195,7 @@ static constexpr const uint32_t reverse_freefall_rc_track_pieces_vertical_suppor
SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW,
};
static void PaintReverseFreefallRcFlat(
static void PaintReverseFreefallRCFlat(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
@ -217,7 +217,7 @@ static void PaintReverseFreefallRcFlat(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
static void PaintReverseFreefallRcStation(
static void PaintReverseFreefallRCStation(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
@ -256,7 +256,7 @@ static void PaintReverseFreefallRcStation(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
static void PaintReverseFreefallRcSlope(
static void PaintReverseFreefallRCSlope(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
@ -357,7 +357,7 @@ static void PaintReverseFreefallRcSlope(
}
}
static void PaintReverseFreefallRcVertical(
static void PaintReverseFreefallRCVertical(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
@ -390,7 +390,7 @@ static void PaintReverseFreefallRcVertical(
}
}
static void PaintReverseFreefallRcOnridePhoto(
static void PaintReverseFreefallRCOnridePhoto(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
@ -421,22 +421,22 @@ static void PaintReverseFreefallRcOnridePhoto(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverseFreefallRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverseFreefallRC(int32_t trackType)
{
switch (trackType)
{
case TrackElemType::Flat:
return PaintReverseFreefallRcFlat;
return PaintReverseFreefallRCFlat;
case TrackElemType::EndStation:
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:
return PaintReverseFreefallRcStation;
return PaintReverseFreefallRCStation;
case TrackElemType::ReverseFreefallSlope:
return PaintReverseFreefallRcSlope;
return PaintReverseFreefallRCSlope;
case TrackElemType::ReverseFreefallVertical:
return PaintReverseFreefallRcVertical;
return PaintReverseFreefallRCVertical;
case TrackElemType::OnRidePhoto:
return PaintReverseFreefallRcOnridePhoto;
return PaintReverseFreefallRCOnridePhoto;
}
return nullptr;
}

2
src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
View File

@ -1458,7 +1458,7 @@ static void ReverserRCTrackRightReverser(
}
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverserRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverserRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
View File

@ -3429,7 +3429,7 @@ static void SideFrictionRCTrackDiag60DegDownTo25DegDown(
SideFrictionRCTrackDiag25DegUpTo60DegUp(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement);
};
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSideFrictionRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSideFrictionRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
View File

@ -8769,7 +8769,7 @@ static void StandUpRCTrackBlockBrakes(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionStandUpRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionStandUpRC(int32_t trackType)
{
switch (trackType)
{

2
src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
View File

@ -4441,7 +4441,7 @@ static void SuspendedSwingingRCTrackBlockBrakes(
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedSwingingRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedSwingingRC(int32_t trackType)
{
switch (trackType)
{

3884
src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

14
src/openrct2/ride/coaster/WoodenRollerCoaster.h
View File

@ -24,7 +24,7 @@ struct sprite_bb_2
CoordsXYZ bb_size;
};
template<bool isClassic> ImageId WoodenRcGetTrackColour(const PaintSession& session)
template<bool isClassic> ImageId WoodenRCGetTrackColour(const PaintSession& session)
{
if (isClassic)
return session.TrackColours[SCHEME_TRACK];
@ -34,7 +34,7 @@ template<bool isClassic> ImageId WoodenRcGetTrackColour(const PaintSession& sess
: session.TrackColours[SCHEME_TRACK].WithPrimary(session.TrackColours[SCHEME_SUPPORTS].GetPrimary());
}
ImageId WoodenRcGetRailsColour(PaintSession& session);
ImageId WoodenRCGetRailsColour(PaintSession& session);
template<bool isClassic>
PaintStruct* WoodenRCTrackPaint(
@ -42,8 +42,8 @@ PaintStruct* WoodenRCTrackPaint(
int16_t bound_box_length_x, int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset,
int16_t bound_box_offset_x, int16_t bound_box_offset_y, int16_t bound_box_offset_z)
{
ImageId imageId = WoodenRcGetTrackColour<isClassic>(session).WithIndex(imageIdTrack);
ImageId railsImageId = WoodenRcGetRailsColour(session).WithIndex(imageIdRails);
ImageId imageId = WoodenRCGetTrackColour<isClassic>(session).WithIndex(imageIdTrack);
ImageId railsImageId = WoodenRCGetRailsColour(session).WithIndex(imageIdRails);
PaintAddImageAsParentRotated(
session, direction, imageId, { x_offset, y_offset, z_offset },
@ -60,17 +60,17 @@ template<bool isClassic> void WoodenRCTrackPaintBb(PaintSession& session, const
if (bb->sprite_id_a == 0)
return;
ImageId imageId = WoodenRcGetTrackColour<isClassic>(session).WithIndex(bb->sprite_id_a);
ImageId imageId = WoodenRCGetTrackColour<isClassic>(session).WithIndex(bb->sprite_id_a);
PaintAddImageAsParent(
session, imageId, { bb->offset.x, bb->offset.y, height + bb->offset.z }, bb->bb_size,
{ bb->bb_offset.x, bb->bb_offset.y, height + bb->bb_offset.z });
if (bb->sprite_id_b != 0)
{
ImageId railsImageId = WoodenRcGetRailsColour(session).WithIndex(bb->sprite_id_b);
ImageId railsImageId = WoodenRCGetRailsColour(session).WithIndex(bb->sprite_id_b);
PaintAddImageAsChild(
session, railsImageId, { bb->offset.x, bb->offset.y, height + bb->offset.z },
{ { bb->bb_offset, height + bb->bb_offset.z }, bb->bb_size });
}
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRcFallback(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionClassicWoodenRCFallback(int32_t trackType);

2
src/openrct2/ride/coaster/meta/BobsleighCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionBobsleighRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionBobsleighRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES |
RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h
View File

@ -22,7 +22,7 @@ constexpr const RideTypeDescriptor ClassicMiniRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_ON_RIDE_PHOTO}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionJuniorRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionJuniorRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor ClassicWoodenRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, 0),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionClassicWoodenRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionClassicWoodenRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionCompactInvertedRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionCompactInvertedRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_IS_SUSPENDED),

2
src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_TWIST}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionCorkscrewRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionCorkscrewRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_BOOSTER, TRACK_SLOPE_STEEP_LONG, TRACK_FLYING_LARGE_HALF_LOOP_UNINVERTED_DOWN, TRACK_FLYING_HALF_LOOP_UNINVERTED_DOWN, TRACK_STATION_END, TRACK_VERTICAL_LOOP, TRACK_POWERED_LIFT}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionFlyingRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionFlyingRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES |

2
src/openrct2/ride/coaster/meta/GigaCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor GigaCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionGigaRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionGigaRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_ALLOW_CABLE_LIFT_HILL),

2
src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionHeartlineTwisterRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionHeartlineTwisterRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ContinuousCircuit)),

2
src/openrct2/ride/coaster/meta/Hypercoaster.h
View File

@ -22,7 +22,7 @@ constexpr const RideTypeDescriptor HypercoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_VERTICAL_LOOP, TRACK_HALF_LOOP, TRACK_CORKSCREW, TRACK_BOOSTER}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionCorkscrewRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionCorkscrewRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionInvertedHairpinRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionInvertedHairpinRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES |
RIDE_TYPE_FLAG_IS_SUSPENDED),

2
src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionInvertedImpulseRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionInvertedImpulseRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES |
RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_IS_SUSPENDED),

2
src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_BOOSTER}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionInvertedRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionInvertedRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG_IS_SUSPENDED),

2
src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_SLOPE_STEEP_UP, TRACK_SLOPE_STEEP_DOWN, TRACK_ON_RIDE_PHOTO}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionJuniorRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionJuniorRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_SLOPE_LONG, TRACK_ZERO_G_ROLL, TRACK_ZERO_G_ROLL_LARGE}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionLimLaunchedRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionLimLaunchedRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_FLYING_HALF_LOOP_UNINVERTED_DOWN, TRACK_BOOSTER}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionLayDownRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionLayDownRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_SLOPE_VERTICAL, TRACK_TWIST, TRACK_CORKSCREW, TRACK_CURVE_VERTICAL, TRACK_QUARTER_LOOP, TRACK_SLOPE_LONG, TRACK_BARREL_ROLL, TRACK_HALF_LOOP, TRACK_HALF_LOOP_MEDIUM, TRACK_HALF_LOOP_LARGE,TRACK_CORKSCREW_LARGE, TRACK_ZERO_G_ROLL, TRACK_ZERO_G_ROLL_LARGE}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionLoopingRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionLoopingRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/MineTrainCoaster.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMineTrainRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMineTrainRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/MiniRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_BOOSTER, TRACK_LIFT_HILL_CURVED}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMiniRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMiniRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMiniSuspendedRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMiniSuspendedRC),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT |
RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |

2
src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMultiDimensionRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMultiDimensionRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES |

2
src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionReverseFreefallRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionReverseFreefallRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT),
SET_FIELD(RideModes, EnumsToFlags(RideMode::LimPoweredLaunch)),
SET_FIELD(DefaultMode, RideMode::LimPoweredLaunch),

2
src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionReverserRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionReverserRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ContinuousCircuit)),

2
src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionSideFrictionRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionSideFrictionRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_BOOSTER, TRACK_LIFT_HILL}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMiniRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionMiniRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionStandUpRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionStandUpRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

2
src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD =
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionSuspendedSwingingRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionSuspendedSwingingRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_IS_SUSPENDED),

2
src/openrct2/ride/coaster/meta/WaterCoaster.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor WaterCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_SLOPE_LONG}),
SET_FIELD(CoveredTrackPieces, {TrackElemType::Flat, TrackElemType::LeftQuarterTurn5Tiles, TrackElemType::RightQuarterTurn5Tiles, TrackElemType::SBendLeft, TrackElemType::SBendRight}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionWaterRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionWaterRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT |
RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIETIES | RIDE_TYPE_FLAG_HAS_LARGE_CURVES | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES),

2
src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h
View File

@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD =
SET_FIELD(ExtraTrackPieces, {TRACK_BOOSTER}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionWoodenRc),
SET_FIELD(TrackPaintFunction, GetTrackPaintFunctionWoodenRC),
SET_FIELD(Flags, RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_HAS_LARGE_CURVES |
RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_ALLOW_MULTIPLE_CIRCUITS),

54
src/openrct2/ride/water/WaterCoaster.cpp
View File

@ -20,7 +20,7 @@ static void WaterRCTrackFlat(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackFlat(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrack25DegUp(
@ -30,7 +30,7 @@ static void WaterRCTrack25DegUp(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrack25DegUp(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackFlatTo25DegUp(
@ -40,7 +40,7 @@ static void WaterRCTrackFlatTo25DegUp(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackFlatTo25DegUp(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrack25DegUpToFlat(
@ -50,7 +50,7 @@ static void WaterRCTrack25DegUpToFlat(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrack25DegUpToFlat(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrack25DegDown(
@ -81,7 +81,7 @@ static void WaterRCTrackDiagFlat(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiagFlat(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackDiag25DegUp(
@ -91,7 +91,7 @@ static void WaterRCTrackDiag25DegUp(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiag25DegUp(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackDiagFlatTo25DegUp(
@ -101,7 +101,7 @@ static void WaterRCTrackDiagFlatTo25DegUp(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiagFlatTo25DegUp(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackDiag25DegUpToFlat(
@ -111,7 +111,7 @@ static void WaterRCTrackDiag25DegUpToFlat(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiag25DegUpToFlat(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackDiag25DegDown(
@ -121,7 +121,7 @@ static void WaterRCTrackDiag25DegDown(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiag25DegDown(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackDiagFlatTo25DegDown(
@ -131,7 +131,7 @@ static void WaterRCTrackDiagFlatTo25DegDown(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiagFlatTo25DegDown(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackDiag25DegDownToFlat(
@ -141,7 +141,7 @@ static void WaterRCTrackDiag25DegDownToFlat(
bool isChained = trackElement.HasChain();
JuniorRCPaintTrackDiag25DegDownToFlat(
session, ride, trackSequence, direction, height, trackElement,
isChained ? JuniorRcChainType::ChainLift : JuniorRcChainType::None);
isChained ? JuniorRCChainType::ChainLift : JuniorRCChainType::None);
}
static void WaterRCTrackStation(
@ -155,21 +155,21 @@ static void WaterRCTrack60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
JuniorRCPaintTrack60DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
JuniorRCPaintTrack60DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrack25DegUpTo60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
JuniorRCPaintTrack25DegUpTo60DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
JuniorRCPaintTrack25DegUpTo60DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrack60DegUpTo25DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
JuniorRCPaintTrack60DegUpTo25DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
JuniorRCPaintTrack60DegUpTo25DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrack60DegDown(
@ -200,7 +200,7 @@ static void WaterRCTrackLeftQuarterTurn5Tiles25DegUp(
const TrackElement& trackElement)
{
JuniorRCPaintTrackLeftQuarterTurn5Tiles25DegUp(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackRightQuarterTurn5Tiles25DegUp(
@ -208,7 +208,7 @@ static void WaterRCTrackRightQuarterTurn5Tiles25DegUp(
const TrackElement& trackElement)
{
JuniorRCPaintTrackRightQuarterTurn5Tiles25DegUp(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static constexpr const uint8_t water_rc_left_quarter_turn_5_tiles_to_right_turn_map[] = {
@ -240,7 +240,7 @@ static void WaterRCTrackRightQuarterTurn3Tiles25DegUp(
const TrackElement& trackElement)
{
JuniorRCPaintTrackRightQuarterTurn3Tiles25DegUp(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackRightQuarterTurn3Tiles25DegDown(
@ -248,7 +248,7 @@ static void WaterRCTrackRightQuarterTurn3Tiles25DegDown(
const TrackElement& trackElement)
{
JuniorRCPaintTrackRightQuarterTurn3Tiles25DegDown(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static constexpr const uint8_t water_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = {
@ -278,7 +278,7 @@ static void WaterRCTrackDiag60DegUp(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
JuniorRCPaintTrackDiag60DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
JuniorRCPaintTrackDiag60DegUp(session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackDiag25DegUpTo60DegUp(
@ -286,7 +286,7 @@ static void WaterRCTrackDiag25DegUpTo60DegUp(
const TrackElement& trackElement)
{
JuniorRCPaintTrackDiag25DegUpTo60DegUp(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackDiag60DegUpTo25DegUp(
@ -294,14 +294,14 @@ static void WaterRCTrackDiag60DegUpTo25DegUp(
const TrackElement& trackElement)
{
JuniorRCPaintTrackDiag60DegUpTo25DegUp(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackDiag60DegDown(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
JuniorRCPaintTrackDiag60DegDown(session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
JuniorRCPaintTrackDiag60DegDown(session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackDiag25DegDownTo60DegDown(
@ -309,7 +309,7 @@ static void WaterRCTrackDiag25DegDownTo60DegDown(
const TrackElement& trackElement)
{
JuniorRCPaintTrackDiag25DegDownTo60DegDown(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
static void WaterRCTrackDiag60DegDownTo25DegDown(
@ -317,10 +317,10 @@ static void WaterRCTrackDiag60DegDownTo25DegDown(
const TrackElement& trackElement)
{
JuniorRCPaintTrackDiag60DegDownTo25DegDown(
session, ride, trackSequence, direction, height, trackElement, JuniorRcChainType::None);
session, ride, trackSequence, direction, height, trackElement, JuniorRCChainType::None);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRc(int32_t trackType)
TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRC(int32_t trackType)
{
switch (trackType)
{
@ -463,7 +463,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRc(int32_t trackType)
case TrackElemType::DiagRightBank:
case TrackElemType::BlockBrakes:
case TrackElemType::Booster:
return GetTrackPaintFunctionJuniorRc(trackType);
return GetTrackPaintFunctionJuniorRC(trackType);
//////////////////////////////////////////////////////
// Use River Rafts
@ -492,7 +492,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRc(int32_t trackType)
return GetTrackPaintFunctionSplashBoats(TrackElemType::Down25ToFlat);
case TrackElemType::OnRidePhoto:
return GetTrackPaintFunctionJuniorRc(trackType);
return GetTrackPaintFunctionJuniorRC(trackType);
}
return nullptr;
}

4
src/openrct2/scenario/Scenario.cpp
View File

@ -101,7 +101,7 @@ void ScenarioBegin()
void ScenarioReset()
{
// Set the scenario pseudo-random seeds
Random::Rct2::Seed s{ 0x1234567F ^ Platform::GetTicks(), 0x789FABCD ^ Platform::GetTicks() };
Random::RCT2::Seed s{ 0x1234567F ^ Platform::GetTicks(), 0x789FABCD ^ Platform::GetTicks() };
gScenarioRand.seed(s);
ResearchResetCurrentItem();
@ -504,7 +504,7 @@ const random_engine_t::state_type& ScenarioRandState()
void ScenarioRandSeed(random_engine_t::result_type s0, random_engine_t::result_type s1)
{
Random::Rct2::Seed s{ s0, s1 };
Random::RCT2::Seed s{ s0, s1 };
gScenarioRand.seed(s);
}

2
src/openrct2/scenario/Scenario.h
View File

@ -23,7 +23,7 @@
struct ResultWithMessage;
using random_engine_t = Random::Rct2::Engine;
using random_engine_t = Random::RCT2::Engine;
enum
{