From a2b2fe3058516621d17c339dbcef1763132aa777 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 12 Sep 2025 19:41:18 +0100 Subject: [PATCH] Codechange: Remove two vector typedefs which are only used once. (#14612) --- src/rail.h | 5 +---- src/road.h | 5 +---- src/table/railtypes.h | 8 ++++---- src/table/roadtypes.h | 4 ++-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/rail.h b/src/rail.h index d945dab24b..4e9e62ee76 100644 --- a/src/rail.h +++ b/src/rail.h @@ -109,9 +109,6 @@ enum RailFenceOffset : uint8_t { RFO_SLOPE_NW_SW, //!< Slope NW, Track Y, Fence SW }; -/** List of rail type labels. */ -typedef std::vector RailTypeLabelList; - /** * This struct contains all the info that is needed to draw and construct tracks. */ @@ -229,7 +226,7 @@ public: /** * Rail type labels this type provides in addition to the main label. */ - RailTypeLabelList alternate_labels; + std::vector alternate_labels; /** * Colour on mini-map diff --git a/src/road.h b/src/road.h index 98482d6462..76355d216e 100644 --- a/src/road.h +++ b/src/road.h @@ -63,9 +63,6 @@ enum RoadTypeSpriteGroup : uint8_t { ROTSG_END, }; -/** List of road type labels. */ -typedef std::vector RoadTypeLabelList; - class RoadTypeInfo { public: /** @@ -140,7 +137,7 @@ public: /** * Road type labels this type provides in addition to the main label. */ - RoadTypeLabelList alternate_labels; + std::vector alternate_labels; /** * Colour on mini-map diff --git a/src/table/railtypes.h b/src/table/railtypes.h index 7ea62899a4..71b64418e1 100644 --- a/src/table/railtypes.h +++ b/src/table/railtypes.h @@ -95,7 +95,7 @@ static const RailTypeInfo _original_railtypes[] = { RAILTYPE_LABEL_RAIL, /* alternate labels */ - RailTypeLabelList(), + {}, /* map colour */ PC_GREY, @@ -197,7 +197,7 @@ static const RailTypeInfo _original_railtypes[] = { RAILTYPE_LABEL_ELECTRIC, /* alternate labels */ - RailTypeLabelList(), + {}, /* map colour */ PC_GREY, @@ -295,7 +295,7 @@ static const RailTypeInfo _original_railtypes[] = { RAILTYPE_LABEL_MONO, /* alternate labels */ - RailTypeLabelList(), + {}, /* map colour */ PC_GREY, @@ -393,7 +393,7 @@ static const RailTypeInfo _original_railtypes[] = { RAILTYPE_LABEL_MAGLEV, /* alternate labels */ - RailTypeLabelList(), + {}, /* map colour */ PC_GREY, diff --git a/src/table/roadtypes.h b/src/table/roadtypes.h index eba40d3ad0..eaf9c93c56 100644 --- a/src/table/roadtypes.h +++ b/src/table/roadtypes.h @@ -78,7 +78,7 @@ static const RoadTypeInfo _original_roadtypes[] = { ROADTYPE_LABEL_ROAD, /* alternate labels */ - RoadTypeLabelList(), + {}, /* map colour */ PC_BLACK, @@ -159,7 +159,7 @@ static const RoadTypeInfo _original_roadtypes[] = { ROADTYPE_LABEL_TRAM, /* alternate labels */ - RoadTypeLabelList(), + {}, /* map colour */ PC_BLACK,