From 9f90ab7b04e9bc675ae13357c00ab7621daf0776 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Wed, 8 Nov 2023 23:45:08 +0000
Subject: [PATCH] Codechange: Use rail/road type label constants instead of
 literals. (#11450)

---
 src/road_type.h       | 3 +++
 src/table/railtypes.h | 8 ++++----
 src/table/roadtypes.h | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/road_type.h b/src/road_type.h
index 172ea83ed4..b0b99b76e1 100644
--- a/src/road_type.h
+++ b/src/road_type.h
@@ -14,6 +14,9 @@
 
 typedef uint32_t RoadTypeLabel;
 
+static const RoadTypeLabel ROADTYPE_ROAD_LABEL = 'ROAD';
+static const RoadTypeLabel ROADTYPE_TRAM_LABEL = 'ELRL';
+
 /**
  * The different roadtypes we support
  *
diff --git a/src/table/railtypes.h b/src/table/railtypes.h
index 7346e0470a..2f913d6b2e 100644
--- a/src/table/railtypes.h
+++ b/src/table/railtypes.h
@@ -90,7 +90,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		'RAIL',
+		RAILTYPE_RAIL_LABEL,
 
 		/* alternate labels */
 		RailTypeLabelList(),
@@ -191,7 +191,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		'ELRL',
+		RAILTYPE_ELECTRIC_LABEL,
 
 		/* alternate labels */
 		RailTypeLabelList(),
@@ -288,7 +288,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		'MONO',
+		RAILTYPE_MONO_LABEL,
 
 		/* alternate labels */
 		RailTypeLabelList(),
@@ -385,7 +385,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		'MGLV',
+		RAILTYPE_MAGLEV_LABEL,
 
 		/* alternate labels */
 		RailTypeLabelList(),
diff --git a/src/table/roadtypes.h b/src/table/roadtypes.h
index 7d5e321a77..77813bec08 100644
--- a/src/table/roadtypes.h
+++ b/src/table/roadtypes.h
@@ -73,7 +73,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
 		0,
 
 		/* road type label */
-		'ROAD',
+		ROADTYPE_ROAD_LABEL,
 
 		/* alternate labels */
 		RoadTypeLabelList(),
@@ -153,7 +153,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
 		0,
 
 		/* road type label */
-		'ELRL',
+		ROADTYPE_TRAM_LABEL,
 
 		/* alternate labels */
 		RoadTypeLabelList(),