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

Consistently use 'Circus'

Browse Source
This commit is contained in:
Gymnasiast
2020-07-19 14:51:37 +02:00
parent c2153ae797
commit bc3ad044f8
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/libopenrct2.vcxproj
View File

@@ -667,7 +667,7 @@
<ClCompile Include="ride\coaster\WoodenRollerCoaster.cpp" />
<ClCompile Include="ride\coaster\WoodenWildMouse.cpp" />
<ClCompile Include="ride\gentle\CarRide.cpp" />
<ClCompile Include="ride\gentle\CircusShow.cpp" />
<ClCompile Include="ride\gentle\Circus.cpp" />
<ClCompile Include="ride\gentle\CrookedHouse.cpp" />
<ClCompile Include="ride\gentle\Dodgems.cpp" />
<ClCompile Include="ride\gentle\FerrisWheel.cpp" />
@@ -764,4 +764,4 @@
<ClCompile Include="world\Wall.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>

4
src/openrct2/localisation/StringIds.h
View File

@@ -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,

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

@@ -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;

2
src/openrct2/ride/RideRatings.h
View File

@@ -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);

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

@@ -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);

20
src/openrct2/ride/gentle/CircusShow.cpp → src/openrct2/ride/gentle/Circus.cpp
View File

@@ -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<const TileElement*>(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;
}

6
src/openrct2/ride/gentle/meta/Circus.h
View File

@@ -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, }),