Codechange: Use rail/road type label constants instead of literals. (…

…#11450)
JGRennison · Nov 8, 2023 · 9f90ab7 · 9f90ab7
1 parent 382d7a9
commit 9f90ab7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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(),