amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: rename and make RailSpriteType a scoped enum

Browse Source 
RailTypeSpriteGroup is now renamed to RailSpriteType
This commit is contained in:
Peter Nelson
2026-04-16 21:01:17 +01:00
committed by Peter Nelson
parent 5cef1ca68a
commit 8568f1f7bc
12 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rail_cmd.cpp
+11 -11
View File
@@ -74,7 +74,7 @@ void ResetRailTypes()
void ResolveRailTypeGUISprites(RailTypeInfo *rti)
{
SpriteID cursors_base = GetCustomRailSprite(rti, INVALID_TILE, RTSG_CURSORS);
SpriteID cursors_base = GetCustomRailSprite(rti, INVALID_TILE, RailSpriteType::UI);
if (cursors_base != 0) {
rti->gui_sprites.build_ns_rail = cursors_base + 0;
rti->gui_sprites.build_x_rail = cursors_base + 1;
@@ -2013,7 +2013,7 @@ static void DrawTrackDetails(const TileInfo *ti, const RailTypeInfo *rti, Palett
* Note: Halftile slopes only have fences on the upper part. */
uint num_sprites = 0;
PalSpriteID psid{
.sprite = GetCustomRailSprite(rti, ti->tile, RTSG_FENCES, IsHalftileSlope(ti->tileh) ? TCX_UPPER_HALFTILE : TCX_NORMAL, &num_sprites),
.sprite = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Fences, IsHalftileSlope(ti->tileh) ? TCX_UPPER_HALFTILE : TCX_NORMAL, &num_sprites),
.pal = pal,
};
if (psid.sprite == 0) {
@@ -2113,8 +2113,8 @@ static void DrawTrackBitsOverlay(TileInfo *ti, TrackBits track, const RailTypeIn
}
bool no_combine = ti->tileh == SLOPE_FLAT && rti->flags.Test(RailTypeFlag::NoSpriteCombine);
SpriteID overlay = GetCustomRailSprite(rti, ti->tile, RTSG_OVERLAY);
SpriteID ground = GetCustomRailSprite(rti, ti->tile, no_combine ? RTSG_GROUND_COMPLETE : RTSG_GROUND);
SpriteID overlay = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Overlay);
SpriteID ground = GetCustomRailSprite(rti, ti->tile, no_combine ? RailSpriteType::GroundComplete : RailSpriteType::Ground);
TrackBits pbs = _settings_client.gui.show_track_reservation ? GetRailReservationTrackBits(ti->tile) : TRACK_BIT_NONE;
if (track == TRACK_BIT_NONE) {
@@ -2196,8 +2196,8 @@ static void DrawTrackBitsOverlay(TileInfo *ti, TrackBits track, const RailTypeIn
if (IsValidCorner(halftile_corner)) {
DrawFoundation(ti, HalftileFoundation(halftile_corner));
overlay = GetCustomRailSprite(rti, ti->tile, RTSG_OVERLAY, TCX_UPPER_HALFTILE);
ground = GetCustomRailSprite(rti, ti->tile, RTSG_GROUND, TCX_UPPER_HALFTILE);
overlay = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Overlay, TCX_UPPER_HALFTILE);
ground = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Ground, TCX_UPPER_HALFTILE);
/* Draw higher halftile-overlay: Use the sloped sprites with three corners raised. They probably best fit the lightning. */
Slope fake_slope = SlopeWithThreeCornersRaised(OppositeCorner(halftile_corner));
@@ -2495,7 +2495,7 @@ static void DrawTile_Rail(TileInfo *ti)
DrawGroundSprite(image, GroundSpritePaletteTransform(image, PAL_NONE, pal));
if (rti->UsesOverlay()) {
SpriteID ground = GetCustomRailSprite(rti, ti->tile, RTSG_GROUND);
SpriteID ground = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Ground);
switch (GetRailDepotDirection(ti->tile)) {
case DIAGDIR_NE:
@@ -2515,7 +2515,7 @@ static void DrawTile_Rail(TileInfo *ti)
}
if (_settings_client.gui.show_track_reservation && HasDepotReservation(ti->tile)) {
SpriteID overlay = GetCustomRailSprite(rti, ti->tile, RTSG_OVERLAY);
SpriteID overlay = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Overlay);
switch (GetRailDepotDirection(ti->tile)) {
case DIAGDIR_NE:
@@ -2555,7 +2555,7 @@ static void DrawTile_Rail(TileInfo *ti)
}
}
}
int depot_sprite = GetCustomRailSprite(rti, ti->tile, RTSG_DEPOT);
int depot_sprite = GetCustomRailSprite(rti, ti->tile, RailSpriteType::Depot);
int relocation = depot_sprite != 0 ? depot_sprite - SPR_RAIL_DEPOT_SE_1 : rti->GetRailtypeSpriteOffset();
if (HasRailCatenaryDrawn(GetRailType(ti->tile))) DrawRailCatenary(ti);
@@ -2579,7 +2579,7 @@ void DrawTrainDepotSprite(int x, int y, int dir, RailType railtype)
DrawSprite(image, PAL_NONE, x, y);
if (rti->UsesOverlay()) {
SpriteID ground = GetCustomRailSprite(rti, INVALID_TILE, RTSG_GROUND);
SpriteID ground = GetCustomRailSprite(rti, INVALID_TILE, RailSpriteType::Ground);
switch (dir) {
case DIAGDIR_SW: DrawSprite(ground + RTO_X, PAL_NONE, x, y); break;
@@ -2587,7 +2587,7 @@ void DrawTrainDepotSprite(int x, int y, int dir, RailType railtype)
default: break;
}
}
int depot_sprite = GetCustomRailSprite(rti, INVALID_TILE, RTSG_DEPOT);
int depot_sprite = GetCustomRailSprite(rti, INVALID_TILE, RailSpriteType::Depot);
if (depot_sprite != 0) offset = depot_sprite - SPR_RAIL_DEPOT_SE_1;
DrawRailTileSeqInGUI(x, y, dts, offset, 0, palette);