From bc3ad044f87a66e416be1b64fa99b6838c693a82 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 19 Jul 2020 14:51:37 +0200 Subject: [PATCH] Consistently use 'Circus' --- OpenRCT2.xcodeproj/project.pbxproj | 8 ++++---- src/openrct2/libopenrct2.vcxproj | 4 ++-- src/openrct2/localisation/StringIds.h | 4 ++-- src/openrct2/ride/RideRatings.cpp | 2 +- src/openrct2/ride/RideRatings.h | 2 +- src/openrct2/ride/TrackPaint.h | 2 +- .../gentle/{CircusShow.cpp => Circus.cpp} | 20 +++++++++---------- src/openrct2/ride/gentle/meta/Circus.h | 6 +++--- test/testpaint/Compat.cpp | 2 +- test/testpaint/Data.cpp | 2 +- test/testpaint/TrackDataOld.cpp | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) rename src/openrct2/ride/gentle/{CircusShow.cpp => Circus.cpp} (84%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 636648106b..ab318e8759 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -381,7 +381,7 @@ C688790A20289B9B0084B384 /* WoodenRollerCoaster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1381F8B744400A9330D /* WoodenRollerCoaster.cpp */; }; C688790B20289B9B0084B384 /* WoodenWildMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1391F8B744400A9330D /* WoodenWildMouse.cpp */; }; C688790C20289B9B0084B384 /* CarRide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F15A1F8B745700A9330D /* CarRide.cpp */; }; - C688790D20289B9B0084B384 /* CircusShow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F15B1F8B745700A9330D /* CircusShow.cpp */; }; + C688790D20289B9B0084B384 /* Circus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F15B1F8B745700A9330D /* Circus.cpp */; }; C688790E20289B9B0084B384 /* CrookedHouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F15C1F8B745700A9330D /* CrookedHouse.cpp */; }; C688790F20289B9B0084B384 /* Dodgems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F15D1F8B745700A9330D /* Dodgems.cpp */; }; C688791020289B9B0084B384 /* FerrisWheel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F15E1F8B745700A9330D /* FerrisWheel.cpp */; }; @@ -883,7 +883,7 @@ 4C93F1381F8B744400A9330D /* WoodenRollerCoaster.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WoodenRollerCoaster.cpp; sourceTree = ""; }; 4C93F1391F8B744400A9330D /* WoodenWildMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WoodenWildMouse.cpp; sourceTree = ""; }; 4C93F15A1F8B745700A9330D /* CarRide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CarRide.cpp; sourceTree = ""; }; - 4C93F15B1F8B745700A9330D /* CircusShow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircusShow.cpp; sourceTree = ""; }; + 4C93F15B1F8B745700A9330D /* Circus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Circus.cpp; sourceTree = ""; }; 4C93F15C1F8B745700A9330D /* CrookedHouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrookedHouse.cpp; sourceTree = ""; }; 4C93F15D1F8B745700A9330D /* Dodgems.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Dodgems.cpp; sourceTree = ""; }; 4C93F15E1F8B745700A9330D /* FerrisWheel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FerrisWheel.cpp; sourceTree = ""; }; @@ -3260,7 +3260,7 @@ isa = PBXGroup; children = ( 4C93F15A1F8B745700A9330D /* CarRide.cpp */, - 4C93F15B1F8B745700A9330D /* CircusShow.cpp */, + 4C93F15B1F8B745700A9330D /* Circus.cpp */, 4C93F15C1F8B745700A9330D /* CrookedHouse.cpp */, 4C93F15D1F8B745700A9330D /* Dodgems.cpp */, 4C93F15E1F8B745700A9330D /* FerrisWheel.cpp */, @@ -4327,7 +4327,7 @@ C688788220289ADE0084B384 /* Rect.cpp in Sources */, 93F9DA3920B46FB800D1BE92 /* ObjectJsonHelpers.cpp in Sources */, C688787320289A780084B384 /* RideRatings.cpp in Sources */, - C688790D20289B9B0084B384 /* CircusShow.cpp in Sources */, + C688790D20289B9B0084B384 /* Circus.cpp in Sources */, C688788F20289B140084B384 /* Chat.cpp in Sources */, C688789A20289B200084B384 /* ConversionTables.cpp in Sources */, C688791020289B9B0084B384 /* FerrisWheel.cpp in Sources */, diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 5279ccf949..98418a6267 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -667,7 +667,7 @@ - + @@ -764,4 +764,4 @@ - + \ No newline at end of file diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 0f4f2821a1..02022fb226 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -68,7 +68,7 @@ enum STR_RIDE_NAME_TWIST = 48, STR_RIDE_NAME_HAUNTED_HOUSE = 49, STR_RIDE_NAME_FIRST_AID = 50, - STR_RIDE_NAME_CIRCUS_SHOW = 51, + STR_RIDE_NAME_CIRCUS = 51, STR_RIDE_NAME_GHOST_TRAIN = 52, STR_RIDE_NAME_TWISTER_ROLLER_COASTER = 53, STR_RIDE_NAME_WOODEN_ROLLER_COASTER = 54, @@ -160,7 +160,7 @@ enum STR_RIDE_DESCRIPTION_TWIST = 558, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE = 559, STR_RIDE_DESCRIPTION_FIRST_AID = 560, - STR_RIDE_DESCRIPTION_CIRCUS_SHOW = 561, + STR_RIDE_DESCRIPTION_CIRCUS = 561, STR_RIDE_DESCRIPTION_GHOST_TRAIN = 562, STR_RIDE_DESCRIPTION_HYPER_TWISTER = 563, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER = 564, diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 64a21b299d..59a2c2e821 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -3485,7 +3485,7 @@ void ride_ratings_calculate_first_aid(Ride* ride) ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; } -void ride_ratings_calculate_circus_show(Ride* ride) +void ride_ratings_calculate_circus(Ride* ride) { ride->lifecycle_flags |= RIDE_LIFECYCLE_TESTED; ride->lifecycle_flags |= RIDE_LIFECYCLE_NO_RAW_STATS; diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 2b3f9121f1..36ace4dede 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -106,7 +106,7 @@ void ride_ratings_calculate_cash_machine(Ride* ride); void ride_ratings_calculate_twist(Ride* ride); void ride_ratings_calculate_haunted_house(Ride* ride); void ride_ratings_calculate_first_aid(Ride* ride); -void ride_ratings_calculate_circus_show(Ride* ride); +void ride_ratings_calculate_circus(Ride* ride); void ride_ratings_calculate_ghost_train(Ride* ride); void ride_ratings_calculate_twister_roller_coaster(Ride* ride); void ride_ratings_calculate_wooden_roller_coaster(Ride* ride); diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index 606c72b966..b0d8f08181 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -434,7 +434,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(int32_t trackType, TRACK_PAINT_FUNCTION get_track_paint_function_facility(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_twist(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(int32_t trackType, int32_t direction); -TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int32_t trackType, int32_t direction); +TRACK_PAINT_FUNCTION get_track_paint_function_circus(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_ghost_train(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_side_friction_rc(int32_t trackType, int32_t direction); diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/Circus.cpp similarity index 84% rename from src/openrct2/ride/gentle/CircusShow.cpp rename to src/openrct2/ride/gentle/Circus.cpp index 4837de6e1e..764e5d7279 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/Circus.cpp @@ -17,7 +17,7 @@ /** * rct2: 0x0077084A */ -static void paint_circus_show_tent( +static void paint_circus_tent( paint_session* session, ride_id_t rideIndex, uint8_t direction, int8_t al, int8_t cl, uint16_t height) { const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); @@ -52,7 +52,7 @@ static void paint_circus_show_tent( /** * rct2: 0x0076FAD4 */ -static void paint_circus_show( +static void paint_circus( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -75,22 +75,22 @@ static void paint_circus_show( switch (trackSequence) { case 1: - paint_circus_show_tent(session, rideIndex, direction, 32, 32, height); + paint_circus_tent(session, rideIndex, direction, 32, 32, height); break; case 3: - paint_circus_show_tent(session, rideIndex, direction, 32, -32, height); + paint_circus_tent(session, rideIndex, direction, 32, -32, height); break; case 5: - paint_circus_show_tent(session, rideIndex, direction, 0, -32, height); + paint_circus_tent(session, rideIndex, direction, 0, -32, height); break; case 6: - paint_circus_show_tent(session, rideIndex, direction, -32, 32, height); + paint_circus_tent(session, rideIndex, direction, -32, 32, height); break; case 7: - paint_circus_show_tent(session, rideIndex, direction, -32, -32, height); + paint_circus_tent(session, rideIndex, direction, -32, -32, height); break; case 8: - paint_circus_show_tent(session, rideIndex, direction, -32, 0, height); + paint_circus_tent(session, rideIndex, direction, -32, 0, height); break; } @@ -123,12 +123,12 @@ static void paint_circus_show( /** * rct2: 0x0076F8D4 */ -TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int32_t trackType, int32_t direction) +TRACK_PAINT_FUNCTION get_track_paint_function_circus(int32_t trackType, int32_t direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return nullptr; } - return paint_circus_show; + return paint_circus; } diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 789bdcc95d..e732e59ce7 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(ExtraTrackPieces, 0), SET_FIELD(CoveredTrackPieces, 0), SET_FIELD(StartTrackPiece, FLAT_TRACK_ELEM_3_X_3), - SET_FIELD(TrackPaintFunction, get_track_paint_function_circus_show), + SET_FIELD(TrackPaintFunction, get_track_paint_function_circus), SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS | RIDE_TYPE_FLAG_MUSIC_ON_DEFAULT | @@ -31,14 +31,14 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(RideModes, (1ULL << RIDE_MODE_CIRCUS_SHOW)), SET_FIELD(DefaultMode, RIDE_MODE_CIRCUS_SHOW), SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), - SET_FIELD(Naming, { STR_RIDE_NAME_CIRCUS_SHOW, STR_RIDE_DESCRIPTION_CIRCUS_SHOW }), + SET_FIELD(Naming, { STR_RIDE_NAME_CIRCUS, STR_RIDE_DESCRIPTION_CIRCUS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), SET_FIELD(EnumName, nameof(RIDE_TYPE_CIRCUS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 128, 3, 2, }), SET_FIELD(MaxMass, 255), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), - SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_circus_show), + SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_circus), SET_FIELD(RatingsMultipliers, { 20, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 125, 2, 1, }), diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index 1ff230e944..8a006487f3 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -710,7 +710,7 @@ void ride_ratings_calculate_first_aid([[maybe_unused]] Ride* ride) { } -void ride_ratings_calculate_circus_show([[maybe_unused]] Ride* ride) +void ride_ratings_calculate_circus([[maybe_unused]] Ride* ride) { } diff --git a/test/testpaint/Data.cpp b/test/testpaint/Data.cpp index ab84dda5a3..b3f1438612 100644 --- a/test/testpaint/Data.cpp +++ b/test/testpaint/Data.cpp @@ -60,7 +60,7 @@ const_utf8string RideNames[RCT2_RIDE_TYPE_COUNT] = { "Twist", "HauntedHouse", "FirstAid", - "CircusShow", + "Circus", "GhostTrain", "TwisterRollerCoaster", "WoodenRollerCoaster", diff --git a/test/testpaint/TrackDataOld.cpp b/test/testpaint/TrackDataOld.cpp index f5c95e0fc4..e1beb38047 100644 --- a/test/testpaint/TrackDataOld.cpp +++ b/test/testpaint/TrackDataOld.cpp @@ -10681,7 +10681,7 @@ static constexpr const uint32_t _OldHauntedHouseTrackPaintFunctions[256] = { }; /** rct2: 0x0076F8D4 */ -static constexpr const uint32_t _OldCircusShowTrackPaintFunctions[256] = { +static constexpr const uint32_t _OldCircusTrackPaintFunctions[256] = { 0, 0, 0, @@ -19312,7 +19312,7 @@ const uint32_t * RideTypeTrackPaintFunctionsOld[RCT2_RIDE_TYPE_COUNT] = { _OldTwistTrackPaintFunctions, // RIDE_TYPE_TWIST _OldHauntedHouseTrackPaintFunctions, // RIDE_TYPE_HAUNTED_HOUSE _OldFacilityTrackPaintFunctions, // RIDE_TYPE_FIRST_AID - _OldCircusShowTrackPaintFunctions, // RIDE_TYPE_CIRCUS + _OldCircusTrackPaintFunctions, // RIDE_TYPE_CIRCUS _OldGhostTrainTrackPaintFunctions, // RIDE_TYPE_GHOST_TRAIN _OldTwisterRollerCoasterTrackPaintFunctions, // RIDE_TYPE_TWISTER_ROLLER_COASTER _OldWoodenRollerCoasterTrackPaintFunctions, // RIDE_TYPE_WOODEN_ROLLER_COASTER