From 235ac0bcebed208412b3ef33f490ad9c766faaa4 Mon Sep 17 00:00:00 2001
From: Tyler Trahan <tyler@tylertrahan.com>
Date: Fri, 10 Nov 2023 17:37:22 -0500
Subject: [PATCH] Codechange: Reword rail/road type label constants (#11451)

---
 src/newgrf.cpp        | 10 +++++-----
 src/rail_type.h       |  8 ++++----
 src/road_type.h       |  4 ++--
 src/table/railtypes.h |  8 ++++----
 src/table/roadtypes.h |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 5bf37d1554..8c76a04d0b 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1056,9 +1056,9 @@ static ChangeInfoResult RailVehicleChangeInfo(uint engine, int numinfo, int prop
 				}
 
 				switch (tracktype) {
-					case 0: _gted[e->index].railtypelabel = rvi->engclass >= 2 ? RAILTYPE_ELECTRIC_LABEL : RAILTYPE_RAIL_LABEL; break;
-					case 1: _gted[e->index].railtypelabel = RAILTYPE_MONO_LABEL; break;
-					case 2: _gted[e->index].railtypelabel = RAILTYPE_MAGLEV_LABEL; break;
+					case 0: _gted[e->index].railtypelabel = rvi->engclass >= 2 ? RAILTYPE_LABEL_ELECTRIC : RAILTYPE_LABEL_RAIL; break;
+					case 1: _gted[e->index].railtypelabel = RAILTYPE_LABEL_MONO; break;
+					case 2: _gted[e->index].railtypelabel = RAILTYPE_LABEL_MAGLEV; break;
 					default:
 						GrfMsg(1, "RailVehicleChangeInfo: Invalid track type {} specified, ignoring", tracktype);
 						break;
@@ -1195,8 +1195,8 @@ static ChangeInfoResult RailVehicleChangeInfo(uint engine, int numinfo, int prop
 				if (_cur.grffile->railtype_list.empty()) {
 					/* Use traction type to select between normal and electrified
 					 * rail only when no translation list is in place. */
-					if (_gted[e->index].railtypelabel == RAILTYPE_RAIL_LABEL     && engclass >= EC_ELECTRIC) _gted[e->index].railtypelabel = RAILTYPE_ELECTRIC_LABEL;
-					if (_gted[e->index].railtypelabel == RAILTYPE_ELECTRIC_LABEL && engclass  < EC_ELECTRIC) _gted[e->index].railtypelabel = RAILTYPE_RAIL_LABEL;
+					if (_gted[e->index].railtypelabel == RAILTYPE_LABEL_RAIL     && engclass >= EC_ELECTRIC) _gted[e->index].railtypelabel = RAILTYPE_LABEL_ELECTRIC;
+					if (_gted[e->index].railtypelabel == RAILTYPE_LABEL_ELECTRIC && engclass  < EC_ELECTRIC) _gted[e->index].railtypelabel = RAILTYPE_LABEL_RAIL;
 				}
 
 				rvi->engclass = engclass;
diff --git a/src/rail_type.h b/src/rail_type.h
index b0796ffd24..ec44021f5d 100644
--- a/src/rail_type.h
+++ b/src/rail_type.h
@@ -14,10 +14,10 @@
 
 typedef uint32_t RailTypeLabel;
 
-static const RailTypeLabel RAILTYPE_RAIL_LABEL     = 'RAIL';
-static const RailTypeLabel RAILTYPE_ELECTRIC_LABEL = 'ELRL';
-static const RailTypeLabel RAILTYPE_MONO_LABEL     = 'MONO';
-static const RailTypeLabel RAILTYPE_MAGLEV_LABEL   = 'MGLV';
+static const RailTypeLabel RAILTYPE_LABEL_RAIL     = 'RAIL';
+static const RailTypeLabel RAILTYPE_LABEL_ELECTRIC = 'ELRL';
+static const RailTypeLabel RAILTYPE_LABEL_MONO     = 'MONO';
+static const RailTypeLabel RAILTYPE_LABEL_MAGLEV   = 'MGLV';
 
 /**
  * Enumeration for all possible railtypes.
diff --git a/src/road_type.h b/src/road_type.h
index b0b99b76e1..e36f023d44 100644
--- a/src/road_type.h
+++ b/src/road_type.h
@@ -14,8 +14,8 @@
 
 typedef uint32_t RoadTypeLabel;
 
-static const RoadTypeLabel ROADTYPE_ROAD_LABEL = 'ROAD';
-static const RoadTypeLabel ROADTYPE_TRAM_LABEL = 'ELRL';
+static const RoadTypeLabel ROADTYPE_LABEL_ROAD = 'ROAD';
+static const RoadTypeLabel ROADTYPE_LABEL_TRAM = 'ELRL';
 
 /**
  * The different roadtypes we support
diff --git a/src/table/railtypes.h b/src/table/railtypes.h
index 2f913d6b2e..69fd27bb4b 100644
--- a/src/table/railtypes.h
+++ b/src/table/railtypes.h
@@ -90,7 +90,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		RAILTYPE_RAIL_LABEL,
+		RAILTYPE_LABEL_RAIL,
 
 		/* alternate labels */
 		RailTypeLabelList(),
@@ -191,7 +191,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		RAILTYPE_ELECTRIC_LABEL,
+		RAILTYPE_LABEL_ELECTRIC,
 
 		/* alternate labels */
 		RailTypeLabelList(),
@@ -288,7 +288,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		RAILTYPE_MONO_LABEL,
+		RAILTYPE_LABEL_MONO,
 
 		/* alternate labels */
 		RailTypeLabelList(),
@@ -385,7 +385,7 @@ static const RailTypeInfo _original_railtypes[] = {
 		0,
 
 		/* rail type label */
-		RAILTYPE_MAGLEV_LABEL,
+		RAILTYPE_LABEL_MAGLEV,
 
 		/* alternate labels */
 		RailTypeLabelList(),
diff --git a/src/table/roadtypes.h b/src/table/roadtypes.h
index 77813bec08..fc20705bc6 100644
--- a/src/table/roadtypes.h
+++ b/src/table/roadtypes.h
@@ -73,7 +73,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
 		0,
 
 		/* road type label */
-		ROADTYPE_ROAD_LABEL,
+		ROADTYPE_LABEL_ROAD,
 
 		/* alternate labels */
 		RoadTypeLabelList(),
@@ -153,7 +153,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
 		0,
 
 		/* road type label */
-		ROADTYPE_TRAM_LABEL,
+		ROADTYPE_LABEL_TRAM,
 
 		/* alternate labels */
 		RoadTypeLabelList(),