Skip to content

Commit c2153ae

Browse files
GymnasiastGymnasiast
committed
Consistenly use 'Swinging Ship'
1 parent 09ece01 commit c2153ae

File tree

12 files changed

+44
-44
lines changed

12 files changed

+44
-44
lines changed

‎OpenRCT2.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
C688792120289B9B0084B384 /* LaunchedFreefall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1811F8B747A00A9330D /* LaunchedFreefall.cpp */; };
405405
C688792220289B9B0084B384 /* MagicCarpet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1821F8B747A00A9330D /* MagicCarpet.cpp */; };
406406
C688792320289B9B0084B384 /* MotionSimulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1831F8B747A00A9330D /* MotionSimulator.cpp */; };
407-
C688792420289B9B0084B384 /* PirateShip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1841F8B747A00A9330D /* PirateShip.cpp */; };
407+
C688792420289B9B0084B384 /* SwingingShip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1841F8B747A00A9330D /* SwingingShip.cpp */; };
408408
C688792520289B9B0084B384 /* RotoDrop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1851F8B747A00A9330D /* RotoDrop.cpp */; };
409409
C688792620289B9B0084B384 /* SwingingInverterShip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1861F8B747A00A9330D /* SwingingInverterShip.cpp */; };
410410
C688792720289B9B0084B384 /* TopSpin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1871F8B747A00A9330D /* TopSpin.cpp */; };
@@ -906,7 +906,7 @@
906906
4C93F1811F8B747A00A9330D /* LaunchedFreefall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LaunchedFreefall.cpp; sourceTree = "<group>"; };
907907
4C93F1821F8B747A00A9330D /* MagicCarpet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MagicCarpet.cpp; sourceTree = "<group>"; };
908908
4C93F1831F8B747A00A9330D /* MotionSimulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MotionSimulator.cpp; sourceTree = "<group>"; };
909-
4C93F1841F8B747A00A9330D /* PirateShip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PirateShip.cpp; sourceTree = "<group>"; };
909+
4C93F1841F8B747A00A9330D /* SwingingShip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SwingingShip.cpp; sourceTree = "<group>"; };
910910
4C93F1851F8B747A00A9330D /* RotoDrop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RotoDrop.cpp; sourceTree = "<group>"; };
911911
4C93F1861F8B747A00A9330D /* SwingingInverterShip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SwingingInverterShip.cpp; sourceTree = "<group>"; };
912912
4C93F1871F8B747A00A9330D /* TopSpin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TopSpin.cpp; sourceTree = "<group>"; };
@@ -3297,7 +3297,7 @@
32973297
4C93F1811F8B747A00A9330D /* LaunchedFreefall.cpp */,
32983298
4C93F1821F8B747A00A9330D /* MagicCarpet.cpp */,
32993299
4C93F1831F8B747A00A9330D /* MotionSimulator.cpp */,
3300-
4C93F1841F8B747A00A9330D /* PirateShip.cpp */,
3300+
4C93F1841F8B747A00A9330D /* SwingingShip.cpp */,
33013301
4C93F1851F8B747A00A9330D /* RotoDrop.cpp */,
33023302
4C93F1861F8B747A00A9330D /* SwingingInverterShip.cpp */,
33033303
4C93F1871F8B747A00A9330D /* TopSpin.cpp */,
@@ -4311,7 +4311,7 @@
43114311
C688791B20289B9B0084B384 /* SpiralSlide.cpp in Sources */,
43124312
C688786C20289A6F0084B384 /* TrackDesign.cpp in Sources */,
43134313
C68878F220289B9B0084B384 /* GigaCoaster.cpp in Sources */,
4314-
C688792420289B9B0084B384 /* PirateShip.cpp in Sources */,
4314+
C688792420289B9B0084B384 /* SwingingShip.cpp in Sources */,
43154315
C68878F420289B9B0084B384 /* InvertedHairpinCoaster.cpp in Sources */,
43164316
C68878A620289B2A0084B384 /* Finance.cpp in Sources */,
43174317
C688788720289ADE0084B384 /* TTFSDLPort.cpp in Sources */,

‎src/openrct2/libopenrct2.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@
696696
<ClCompile Include="ride\thrill\LaunchedFreefall.cpp" />
697697
<ClCompile Include="ride\thrill\MagicCarpet.cpp" />
698698
<ClCompile Include="ride\thrill\MotionSimulator.cpp" />
699-
<ClCompile Include="ride\thrill\PirateShip.cpp" />
699+
<ClCompile Include="ride\thrill\SwingingShip.cpp" />
700700
<ClCompile Include="ride\thrill\RotoDrop.cpp" />
701701
<ClCompile Include="ride\thrill\SwingingInverterShip.cpp" />
702702
<ClCompile Include="ride\thrill\TopSpin.cpp" />
@@ -764,4 +764,4 @@
764764
<ClCompile Include="world\Wall.cpp" />
765765
</ItemGroup>
766766
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
767-
</Project>
767+
</Project>

‎src/openrct2/localisation/StringIds.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ enum
4545
STR_RIDE_NAME_LOG_FLUME = 25,
4646
STR_RIDE_NAME_RIVER_RAPIDS = 26,
4747
STR_RIDE_NAME_DODGEMS = 27,
48-
STR_RIDE_NAME_PIRATE_SHIP = 28,
48+
STR_RIDE_NAME_SWINGING_SHIP = 28,
4949
STR_RIDE_NAME_SWINGING_INVERTER_SHIP = 29,
5050
STR_RIDE_NAME_FOOD_STALL = 30,
5151
STR_RIDE_NAME_1D = 31,
@@ -137,7 +137,7 @@ enum
137137
STR_RIDE_DESCRIPTION_LOG_FLUME = 535,
138138
STR_RIDE_DESCRIPTION_RIVER_RAPIDS = 536,
139139
STR_RIDE_DESCRIPTION_DODGEMS = 537,
140-
STR_RIDE_DESCRIPTION_PIRATE_SHIP = 538,
140+
STR_RIDE_DESCRIPTION_SWINGING_SHIP = 538,
141141
STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP = 539,
142142
STR_RIDE_DESCRIPTION_FOOD_STALL = 540,
143143

‎src/openrct2/ride/RideRatings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2706,7 +2706,7 @@ void ride_ratings_calculate_dodgems(Ride* ride)
27062706
ride->sheltered_eighths = 7;
27072707
}
27082708

2709-
void ride_ratings_calculate_pirate_ship(Ride* ride)
2709+
void ride_ratings_calculate_swinging_ship(Ride* ride)
27102710
{
27112711
ride->lifecycle_flags |= RIDE_LIFECYCLE_TESTED;
27122712
ride->lifecycle_flags |= RIDE_LIFECYCLE_NO_RAW_STATS;

‎src/openrct2/ride/RideRatings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void ride_ratings_calculate_go_karts(Ride* ride);
8787
void ride_ratings_calculate_log_flume(Ride* ride);
8888
void ride_ratings_calculate_river_rapids(Ride* ride);
8989
void ride_ratings_calculate_dodgems(Ride* ride);
90-
void ride_ratings_calculate_pirate_ship(Ride* ride);
90+
void ride_ratings_calculate_swinging_ship(Ride* ride);
9191
void ride_ratings_calculate_inverter_ship(Ride* ride);
9292
void ride_ratings_calculate_food_stall(Ride* ride);
9393
void ride_ratings_calculate_shop(Ride* ride);

‎src/openrct2/ride/TrackPaint.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(int32_t trackType, int32_
419419
TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int32_t trackType, int32_t direction);
420420
TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(int32_t trackType, int32_t direction);
421421
TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int32_t trackType, int32_t direction);
422-
TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int32_t trackType, int32_t direction);
422+
TRACK_PAINT_FUNCTION get_track_paint_function_swinging_ship(int32_t trackType, int32_t direction);
423423
TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(int32_t trackType, int32_t direction);
424424
TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(int32_t trackType, int32_t direction);
425425
TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int32_t trackType, int32_t direction);

src/openrct2/ride/thrill/PirateShip.cpp renamed to src/openrct2/ride/thrill/SwingingShip.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static constexpr const uint8_t track_map_1x5[][5] = {
2222
{ 0, 1, 2, 3, 4 },
2323
};
2424

25-
struct pirate_ship_bound_box
25+
struct swinging_ship_bound_box
2626
{
2727
int16_t length_x;
2828
int16_t length_y;
@@ -31,10 +31,10 @@ struct pirate_ship_bound_box
3131
};
3232

3333
/** rct2: 0x008A83B0 */
34-
static constexpr const uint32_t pirate_ship_base_sprite_offset[] = { 0, 9, 0, 9 };
34+
static constexpr const uint32_t swinging_ship_base_sprite_offset[] = { 0, 9, 0, 9 };
3535

3636
/** rct2: 0x008A83C0 */
37-
static constexpr const pirate_ship_bound_box pirate_ship_data[] = {
37+
static constexpr const swinging_ship_bound_box swinging_ship_data[] = {
3838
{ 31, 16, 1, 8 },
3939
{ 16, 31, 8, 1 },
4040
{ 31, 16, 1, 8 },
@@ -43,19 +43,19 @@ static constexpr const pirate_ship_bound_box pirate_ship_data[] = {
4343

4444
enum
4545
{
46-
SPR_PIRATE_SHIP_FRAME_SW_NE = 21994,
47-
SPR_PIRATE_SHIP_FRAME_FRONT_SW_NE = 21995,
48-
SPR_PIRATE_SHIP_FRAME_NW_SE = 21996,
49-
SPR_PIRATE_SHIP_FRAME_FRONT_NW_SE = 21997,
46+
SPR_SWINGING_SHIP_FRAME_SW_NE = 21994,
47+
SPR_SWINGING_SHIP_FRAME_FRONT_SW_NE = 21995,
48+
SPR_SWINGING_SHIP_FRAME_NW_SE = 21996,
49+
SPR_SWINGING_SHIP_FRAME_FRONT_NW_SE = 21997,
5050
};
5151

52-
static constexpr const uint32_t pirate_ship_frame_sprites[][2] = {
53-
{ SPR_PIRATE_SHIP_FRAME_SW_NE, SPR_PIRATE_SHIP_FRAME_FRONT_SW_NE },
54-
{ SPR_PIRATE_SHIP_FRAME_NW_SE, SPR_PIRATE_SHIP_FRAME_FRONT_NW_SE },
52+
static constexpr const uint32_t swinging_ship_frame_sprites[][2] = {
53+
{ SPR_SWINGING_SHIP_FRAME_SW_NE, SPR_SWINGING_SHIP_FRAME_FRONT_SW_NE },
54+
{ SPR_SWINGING_SHIP_FRAME_NW_SE, SPR_SWINGING_SHIP_FRAME_FRONT_NW_SE },
5555
};
5656

5757
/** rct2: 0x4AF254 */
58-
static void paint_pirate_ship_structure(
58+
static void paint_swinging_ship_structure(
5959
paint_session* session, Ride* ride, uint8_t direction, int8_t axisOffset, uint16_t height)
6060
{
6161
uint32_t imageId, baseImageId;
@@ -78,7 +78,7 @@ static void paint_pirate_ship_structure(
7878
session->CurrentlyDrawnItem = vehicle;
7979
}
8080

81-
baseImageId = rideEntry->vehicles[0].base_image_id + pirate_ship_base_sprite_offset[direction];
81+
baseImageId = rideEntry->vehicles[0].base_image_id + swinging_ship_base_sprite_offset[direction];
8282
if (vehicle != nullptr)
8383
{
8484
int32_t rotation = static_cast<int8_t>(vehicle->vehicle_sprite_type);
@@ -103,9 +103,9 @@ static void paint_pirate_ship_structure(
103103
imageColourFlags = SPRITE_ID_PALETTE_COLOUR_2(ride->vehicle_colours[0].Body, ride->vehicle_colours[0].Trim);
104104
}
105105

106-
pirate_ship_bound_box bounds = pirate_ship_data[direction];
106+
swinging_ship_bound_box bounds = swinging_ship_data[direction];
107107

108-
imageId = pirate_ship_frame_sprites[(direction & 1)][0] | session->TrackColours[SCHEME_TRACK];
108+
imageId = swinging_ship_frame_sprites[(direction & 1)][0] | session->TrackColours[SCHEME_TRACK];
109109
sub_98197C(
110110
session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y,
111111
height);
@@ -156,7 +156,7 @@ static void paint_pirate_ship_structure(
156156
}
157157
}
158158

159-
imageId = pirate_ship_frame_sprites[(direction & 1)][1] | session->TrackColours[SCHEME_TRACK];
159+
imageId = swinging_ship_frame_sprites[(direction & 1)][1] | session->TrackColours[SCHEME_TRACK];
160160
sub_98199C(
161161
session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y,
162162
height);
@@ -166,7 +166,7 @@ static void paint_pirate_ship_structure(
166166
}
167167

168168
/** rct2: 0x008A85C4 */
169-
static void paint_pirate_ship(
169+
static void paint_swinging_ship(
170170
paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
171171
const TileElement* tileElement)
172172
{
@@ -296,19 +296,19 @@ static void paint_pirate_ship(
296296
switch (relativeTrackSequence)
297297
{
298298
case 1:
299-
paint_pirate_ship_structure(session, ride, direction, 64, height);
299+
paint_swinging_ship_structure(session, ride, direction, 64, height);
300300
break;
301301
case 2:
302-
paint_pirate_ship_structure(session, ride, direction, 32, height);
302+
paint_swinging_ship_structure(session, ride, direction, 32, height);
303303
break;
304304
case 0:
305-
paint_pirate_ship_structure(session, ride, direction, 0, height);
305+
paint_swinging_ship_structure(session, ride, direction, 0, height);
306306
break;
307307
case 3:
308-
paint_pirate_ship_structure(session, ride, direction, -32, height);
308+
paint_swinging_ship_structure(session, ride, direction, -32, height);
309309
break;
310310
case 4:
311-
paint_pirate_ship_structure(session, ride, direction, -64, height);
311+
paint_swinging_ship_structure(session, ride, direction, -64, height);
312312
break;
313313
}
314314

@@ -318,12 +318,12 @@ static void paint_pirate_ship(
318318
/**
319319
* rct2: 0x008A83E0
320320
*/
321-
TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int32_t trackType, int32_t direction)
321+
TRACK_PAINT_FUNCTION get_track_paint_function_swinging_ship(int32_t trackType, int32_t direction)
322322
{
323323
if (trackType != FLAT_TRACK_ELEM_1_X_5)
324324
{
325325
return nullptr;
326326
}
327327

328-
return paint_pirate_ship;
328+
return paint_swinging_ship;
329329
}

‎src/openrct2/ride/thrill/meta/SwingingShip.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD =
2323
SET_FIELD(ExtraTrackPieces, 0),
2424
SET_FIELD(CoveredTrackPieces, 0),
2525
SET_FIELD(StartTrackPiece, FLAT_TRACK_ELEM_1_X_5),
26-
SET_FIELD(TrackPaintFunction, get_track_paint_function_pirate_ship),
26+
SET_FIELD(TrackPaintFunction, get_track_paint_function_swinging_ship),
2727
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION |
2828
RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_HAS_NO_TRACK |
2929
RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE |
@@ -32,14 +32,14 @@ constexpr const RideTypeDescriptor SwingingShipRTD =
3232
SET_FIELD(RideModes, (1ULL << RIDE_MODE_SWING)),
3333
SET_FIELD(DefaultMode, RIDE_MODE_SWING),
3434
SET_FIELD(OperatingSettings, { 7, 25, 0, 0, 0, 0 }),
35-
SET_FIELD(Naming, { STR_RIDE_NAME_PIRATE_SHIP, STR_RIDE_DESCRIPTION_PIRATE_SHIP }),
35+
SET_FIELD(Naming, { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP }),
3636
SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_SHIP, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }),
3737
SET_FIELD(EnumName, nameof(RIDE_TYPE_SWINGING_SHIP)),
3838
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)),
3939
SET_FIELD(Heights, { 12, 112, 7, 11, }),
4040
SET_FIELD(MaxMass, 255),
4141
SET_FIELD(LiftData, { SoundId::Null, 5, 5 }),
42-
SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_pirate_ship),
42+
SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_swinging_ship),
4343
SET_FIELD(RatingsMultipliers, { 50, 30, 10 }),
4444
SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }),
4545
SET_FIELD(BuildCosts, { 155, 2, 1, }),
@@ -50,7 +50,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD =
5050
SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(
5151
{ COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK },
5252
)),
53-
SET_FIELD(ColourPreview, { SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS }),
53+
SET_FIELD(ColourPreview, { SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_SUPPORTS }),
5454
SET_FIELD(ColourKey, RideColourKey::Ride),
5555
};
5656
// clang-format on

‎src/openrct2/sprites.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,8 @@ enum
601601
SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_SUPPORTS = 14271,
602602
SPR_RIDE_DESIGN_PREVIEW_DODGEMS_TRACK = 14272,
603603
SPR_RIDE_DESIGN_PREVIEW_DODGEMS_SUPPORTS = 14273,
604-
SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK = 14274,
605-
SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS = 14275,
604+
SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_TRACK = 14274,
605+
SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_SUPPORTS = 14275,
606606
SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_TRACK = 14276,
607607
SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_SUPPORTS = 14277,
608608

‎test/testpaint/Compat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ void ride_ratings_calculate_dodgems([[maybe_unused]] Ride* ride)
634634
{
635635
}
636636

637-
void ride_ratings_calculate_pirate_ship([[maybe_unused]] Ride* ride)
637+
void ride_ratings_calculate_swinging_ship([[maybe_unused]] Ride* ride)
638638
{
639639
}
640640

0 commit comments

Comments
 (0)