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

Consistify & genericify lattice triangle track

Browse Source 
This PR renames all instances of "Giga" or "Intamin" with "Lattice Triangle" to prepare for 3 additional ride types using this track type.
This commit is contained in:
AuraSpecs
2024-08-09 13:19:48 +02:00
committed by GitHub
parent 41a6e9d252
commit f9f6bca14c
612 changed files with 2488 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/libopenrct2.vcxproj
View File

@@ -898,7 +898,7 @@
<ClCompile Include="paint\track\coaster\ClassicWoodenRollerCoaster.cpp" />
<ClCompile Include="paint\track\coaster\CompactInvertedCoaster.cpp" />
<ClCompile Include="paint\track\coaster\FlyingRollerCoaster.cpp" />
<ClCompile Include="paint\track\coaster\GigaCoaster.cpp" />
<ClCompile Include="paint\track\coaster\LatticeTriangleTrack.cpp" />
<ClCompile Include="paint\track\coaster\HeartlineTwisterCoaster.cpp" />
<ClCompile Include="paint\track\coaster\HybridCoaster.cpp" />
<ClCompile Include="paint\track\coaster\InvertedHairpinCoaster.cpp" />

3293
src/openrct2/paint/track/coaster/GigaCoaster.cpp → src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp
View File

File diff suppressed because it is too large Load Diff

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

@@ -584,7 +584,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedMonorail(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 GetTrackPaintFunctionLatticeTriangleTrack(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionRotoDrop(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingSaucers(int32_t trackType);
TRACK_PAINT_FUNCTION GetTrackPaintFunctionCrookedHouse(int32_t trackType);

4
src/openrct2/ride/rtd/coaster/GigaCoaster.h
View File

@@ -20,7 +20,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD =
.Category = RIDE_CATEGORY_ROLLERCOASTER,
.StartTrackPiece = OpenRCT2::TrackElemType::EndStation,
.TrackPaintFunctions = TrackDrawerDescriptor({
.Drawer = GetTrackPaintFunctionGigaRC,
.Drawer = GetTrackPaintFunctionLatticeTriangleTrack,
.EnabledTrackPieces = {TRACK_STRAIGHT, TRACK_STATION_END, TRACK_LIFT_HILL, TRACK_FLAT_ROLL_BANKING, TRACK_SLOPE, TRACK_SLOPE_STEEP_UP, TRACK_SLOPE_STEEP_DOWN, TRACK_SLOPE_CURVE, TRACK_SLOPE_CURVE_STEEP, TRACK_S_BEND, TRACK_CURVE_SMALL, TRACK_CURVE, TRACK_CURVE_LARGE, TRACK_HELIX_DOWN_BANKED_HALF, TRACK_HELIX_UP_BANKED_HALF, TRACK_BRAKES, TRACK_ON_RIDE_PHOTO, TRACK_BLOCK_BRAKES, TRACK_SLOPE_ROLL_BANKING, TRACK_SLOPE_STEEP_LONG, TRACK_LIFT_HILL_CABLE, TRACK_BOOSTER, TRACK_POWERED_LIFT, TRACK_SLOPE_CURVE_BANKED, TRACK_SLOPE_CURVE_LARGE, TRACK_DIAG_BRAKES, TRACK_DIAG_BLOCK_BRAKES, TRACK_SLOPE_VERTICAL, TRACK_CURVE_VERTICAL},
.ExtraTrackPieces = {TRACK_BARREL_ROLL, TRACK_QUARTER_LOOP, TRACK_HALF_LOOP, TRACK_HALF_LOOP_MEDIUM, TRACK_HALF_LOOP_LARGE, TRACK_VERTICAL_LOOP, TRACK_CORKSCREW, TRACK_CORKSCREW_LARGE, TRACK_ZERO_G_ROLL, TRACK_ZERO_G_ROLL_LARGE},
}),
@@ -56,7 +56,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD =
{ COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK },
{ COLOUR_BRIGHT_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN }, // Mega-Lite / 蓝月飞车
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS },
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_GIGA_RC, SPR_RIDE_DESIGN_PREVIEW_GIGA_RC_SUPPORTS },
.ColourKey = RideColourKey::Ride,
.Name = "giga_rc",
.RatingsData =

56
src/openrct2/sprites.h
View File

@@ -657,8 +657,8 @@ enum
SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_SUPPORTS = 14355,
SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_TRACK = 14356,
SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_SUPPORTS = 14357,
SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK = 14358,
SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS = 14359,
SPR_RIDE_DESIGN_PREVIEW_GIGA_RC = 14358,
SPR_RIDE_DESIGN_PREVIEW_GIGA_RC_SUPPORTS = 14359,
SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_TRACK = 14360,
SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_SUPPORTS = 14361,
SPR_RIDE_DESIGN_PREVIEW_FLYING_SAUCERS_TRACK = 14362,
@@ -1223,33 +1223,33 @@ enum
SPR_G2_JUNIOR_DIAG_BRAKES,
SPR_G2_JUNIOR_RC_END = SPR_G2_JUNIOR_DIAG_BRAKES + 6,
SPR_G2_GIGA_RC_BEGIN = SPR_G2_JUNIOR_RC_END,
SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_GIGA_RC_BEGIN,
SPR_G2_GIGA_RC_BOOSTER_NW_SE,
SPR_G2_GIGA_RC_DIAG_BRAKES,
SPR_G2_GIGA_RC_POWERED_LIFT_0 = SPR_G2_GIGA_RC_DIAG_BRAKES + 6,
SPR_G2_GIGA_RC_POWERED_LIFT_1,
SPR_G2_GIGA_RC_POWERED_LIFT_2,
SPR_G2_GIGA_RC_POWERED_LIFT_3,
SPR_G2_GIGA_TRACK_VERTICAL,
SPR_G2_GIGA_TRACK_VERTICAL_TWIST = SPR_G2_GIGA_TRACK_VERTICAL + 12,
SPR_G2_GIGA_TRACK_BARREL_ROLL = SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 12,
SPR_G2_GIGA_TRACK_HALF_LOOP = SPR_G2_GIGA_TRACK_BARREL_ROLL + 48,
SPR_G2_GIGA_TRACK_VERTICAL_LOOP = SPR_G2_GIGA_TRACK_HALF_LOOP + 16,
SPR_G2_GIGA_TRACK_QUARTER_LOOP = SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 32,
SPR_G2_GIGA_TRACK_CORKSCREW = SPR_G2_GIGA_TRACK_QUARTER_LOOP + 12,
SPR_G2_GIGA_TRACK_LARGE_CORKSCREW = SPR_G2_GIGA_TRACK_CORKSCREW + 24,
SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION = SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 40,
SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP = SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 18,
SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP = SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 40,
SPR_G2_GIGA_TRACK_ZERO_G_ROLL = SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 56,
SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL = SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 32,
SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 40,
SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE = SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 20,
SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 64,
SPR_G2_GIGA_RC_END = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 128,
SPR_G2_LATTICE_TRIANGLE_TRACK_BEGIN = SPR_G2_JUNIOR_RC_END,
SPR_G2_LATTICE_TRIANGLE_TRACK_BOOSTER_NE_SW = SPR_G2_LATTICE_TRIANGLE_TRACK_BEGIN,
SPR_G2_LATTICE_TRIANGLE_TRACK_BOOSTER_NW_SE,
SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES,
SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_0 = SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 6,
SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_1,
SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_2,
SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_3,
SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL,
SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST = SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 12,
SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL = SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 12,
SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 48,
SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 16,
SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 32,
SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW = SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 12,
SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW = SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 24,
SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION = SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 40,
SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 18,
SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 40,
SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL = SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 56,
SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL = SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 32,
SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 40,
SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE = SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 20,
SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED = SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 64,
SPR_G2_LATTICE_TRIANGLE_TRACK_END = SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 128,
SPR_G2_MINI_RC_BEGIN = SPR_G2_GIGA_RC_END,
SPR_G2_MINI_RC_BEGIN = SPR_G2_LATTICE_TRIANGLE_TRACK_END,
SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_MINI_RC_BEGIN,
SPR_G2_MINI_RC_BOOSTER_NW_SE,
SPR_G2_MINI_RC_END,