--- a/engine_gui.c	Sat Oct 15 16:43:18 2005 +0000
+++ b/engine_gui.c	Sun Oct 16 07:58:15 2005 +0000
@@ -19,12 +19,9 @@
 {
 	if (engine < NUM_TRAIN_ENGINES) {
 		switch (GetEngine(engine)->railtype) {
-			case 0:
-				return STR_8102_RAILROAD_LOCOMOTIVE;
-			case 1:
-				return STR_8106_MONORAIL_LOCOMOTIVE;
-			case 2:
-				return STR_8107_MAGLEV_LOCOMOTIVE;
+			case RAILTYPE_RAIL:   return STR_8102_RAILROAD_LOCOMOTIVE;
+			case RAILTYPE_MONO:   return STR_8106_MONORAIL_LOCOMOTIVE;
+			case RAILTYPE_MAGLEV: return STR_8107_MAGLEV_LOCOMOTIVE;
 		}
 	}
 

--- a/train_cmd.c	Sat Oct 15 16:43:18 2005 +0000
+++ b/train_cmd.c	Sun Oct 16 07:58:15 2005 +0000
@@ -291,7 +291,7 @@
 
 	v->max_speed = max_speed;
 
-	if (v->u.rail.railtype != 2) {
+	if (v->u.rail.railtype != RAILTYPE_MAGLEV) {
 		resistance = 13 * mass / 10;
 		resistance += 60 * num;
 		resistance += friction * mass * speed / 1000;
@@ -303,14 +303,14 @@
 
 	if (speed > 0) {
 		switch (v->u.rail.railtype) {
-			case 0:
-			case 1:
+			case RAILTYPE_RAIL:
+			case RAILTYPE_MONO:
 				force = power / speed; //[N]
 				force *= 22;
 				force /= 10;
 				break;
 
-			case 2:
+			case RAILTYPE_MAGLEV:
 				force = power / 25;
 				break;
 		}
@@ -321,7 +321,7 @@
 
 	if (force <= 0) force = 10000;
 
-	if (v->u.rail.railtype != 2) force = min(force, mass * 10 * 200);
+	if (v->u.rail.railtype != RAILTYPE_MAGLEV) force = min(force, mass * 10 * 200);
 
 	if (mode == AM_ACCEL) {
 		return (force - resistance) / (mass * 4);
@@ -1743,7 +1743,7 @@
 
 		// no smoke?
 		if (RailVehInfo(engtype)->flags & 2 ||
-				GetEngine(engtype)->railtype > 0 ||
+				GetEngine(engtype)->railtype > RAILTYPE_RAIL ||
 				(v->vehstatus & VS_HIDDEN) || (v->u.rail.track & 0xC0))
 			continue;
 
@@ -1788,13 +1788,15 @@
 	EngineID engtype = v->engine_type;
 
 	switch (GetEngine(engtype)->railtype) {
-		case 0:
+		case RAILTYPE_RAIL:
 			SndPlayVehicleFx(sfx[RailVehInfo(engtype)->engclass], v);
 			break;
-		case 1:
+
+		case RAILTYPE_MONO:
 			SndPlayVehicleFx(SND_47_MAGLEV_2, v);
 			break;
-		case 2:
+
+		case RAILTYPE_MAGLEV:
 			SndPlayVehicleFx(SND_41_MAGLEV, v);
 			break;
 	}

--- a/vehicle_gui.c	Sat Oct 15 16:43:18 2005 +0000
+++ b/vehicle_gui.c	Sun Oct 16 07:58:15 2005 +0000
@@ -175,7 +175,7 @@
 /* General Vehicle GUI based procedures that are independent of vehicle types */
 void InitializeVehiclesGuiList(void)
 {
-	_railtype_selected_in_replace_gui = 0;
+	_railtype_selected_in_replace_gui = RAILTYPE_RAIL;
 }
 
 // draw the vehicle profit button in the vehicle list window.