(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.

-Codechange: Add and use RAILVEH_SINGLEHEAD when railveh_type is set to 0, which was implicit before.
-Cleanup: Remove some extraneous parenthesis.

1 files changed, 31 insertions, 29 deletions

diff --git a/src/table/engines.h b/src/table/engines.h
index 4ca84508a..67ed15d3f 100644
--- a/src/table/engines.h
+++ b/src/table/engines.h
@@ -329,8 +329,9 @@ const EngineInfo orig_engine_info[] = {
  * Tractive effort coefficient by default is the same as TTDPatch, 0.30*256=76
  */
 #define RVI(a, b, c, d, e, f, g, h, i, j, k, l) { a, b, c, {l}, d, e, f, g, h, h, i, j, k, 0, 0, 0, 0, 76, 0 }
-#define M RVI_MULTIHEAD
-#define W RVI_WAGON
+#define M RAILVEH_MULTIHEAD
+#define W RAILVEH_WAGON
+#define G RAILVEH_SINGLEHEAD
 #define S 0
 #define D 1
 #define E 2
@@ -346,31 +347,31 @@ const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES] = {
 	//   |  |    base_cost     |    weight |  |   capacity
 	//   |  |    |    |        |    |      |  |   |  cargo_type
 	//   |  |    |    |        |    |      |  |   |  |
-	RVI( 2, 0,   7,  64,     300,  47,    50, S,  0, 0              ,  1, R), //   0
-	RVI(19, 0,   8,  80,     600,  65,    65, D,  0, 0              ,  4, R), //   1
-	RVI( 2, 0,  10,  72,     400,  85,    90, S,  0, 0              ,  7, R), //   2
-	RVI( 0, 0,  15,  96,     900, 130,   130, S,  0, 0              , 19, R), //   3
-	RVI( 1, 0,  19, 112,    1000, 140,   145, S,  0, 0              , 20, R), //   4
-	RVI(12, 0,  16, 120,    1400,  95,   125, D,  0, 0              , 30, R), //   5
-	RVI(14, 0,  20, 152,    2000, 120,   135, D,  0, 0              , 31, R), //   6
-	RVI( 3, 0,  14,  88,    1100, 145,   130, S,  0, 0              , 19, R), //   7
-	RVI( 0, 0,  13, 112,    1000, 131,   120, S,  0, 0              , 20, R), //   8
-	RVI( 1, 0,  19, 128,    1200, 162,   140, S,  0, 0              , 21, R), //   9
-	RVI( 0, 0,  22, 144,    1600, 170,   130, S,  0, 0              , 22, R), //  10
+	RVI( 2, G,   7,  64,     300,  47,    50, S,  0, 0              ,  1, R), //   0
+	RVI(19, G,   8,  80,     600,  65,    65, D,  0, 0              ,  4, R), //   1
+	RVI( 2, G,  10,  72,     400,  85,    90, S,  0, 0              ,  7, R), //   2
+	RVI( 0, G,  15,  96,     900, 130,   130, S,  0, 0              , 19, R), //   3
+	RVI( 1, G,  19, 112,    1000, 140,   145, S,  0, 0              , 20, R), //   4
+	RVI(12, G,  16, 120,    1400,  95,   125, D,  0, 0              , 30, R), //   5
+	RVI(14, G,  20, 152,    2000, 120,   135, D,  0, 0              , 31, R), //   6
+	RVI( 3, G,  14,  88,    1100, 145,   130, S,  0, 0              , 19, R), //   7
+	RVI( 0, G,  13, 112,    1000, 131,   120, S,  0, 0              , 20, R), //   8
+	RVI( 1, G,  19, 128,    1200, 162,   140, S,  0, 0              , 21, R), //   9
+	RVI( 0, G,  22, 144,    1600, 170,   130, S,  0, 0              , 22, R), //  10
 	RVI( 8, M,  11, 112,   600/2,32/2,  85/2, D, 38, CT_PASSENGERS  , 10, R), //  11
 	RVI(10, M,  14, 120,   700/2,38/2,  70/2, D, 40, CT_PASSENGERS  , 11, R), //  12
-	RVI( 4, 0,  15, 128,    1250,  72,    95, D,  0, 0              , 30, R), //  13
-	RVI( 5, 0,  17, 144,    1750, 101,   120, D,  0, 0              , 31, R), //  14
-	RVI( 4, 0,  18, 160,    2580, 112,   140, D,  0, 0              , 32, R), //  15
-	RVI(14, 0,  23,  96,    4000, 150,   135, D,  0, 0              , 33, R), //  16
-	RVI(12, 0,  16, 112,    2400, 120,   105, D,  0, 0              , 34, R), //  17
-	RVI(13, 0,  30, 112,    6600, 207,   155, D,  0, 0              , 35, R), //  18
-	RVI(15, 0,  18, 104,    1500, 110,   105, D,  0, 0              , 29, R), //  19
+	RVI( 4, G,  15, 128,    1250,  72,    95, D,  0, 0              , 30, R), //  13
+	RVI( 5, G,  17, 144,    1750, 101,   120, D,  0, 0              , 31, R), //  14
+	RVI( 4, G,  18, 160,    2580, 112,   140, D,  0, 0              , 32, R), //  15
+	RVI(14, G,  23,  96,    4000, 150,   135, D,  0, 0              , 33, R), //  16
+	RVI(12, G,  16, 112,    2400, 120,   105, D,  0, 0              , 34, R), //  17
+	RVI(13, G,  30, 112,    6600, 207,   155, D,  0, 0              , 35, R), //  18
+	RVI(15, G,  18, 104,    1500, 110,   105, D,  0, 0              , 29, R), //  19
 	RVI(16, M,  35, 160,  3500/2,95/2, 205/2, D,  0, 0              , 45, R), //  20
-	RVI(18, 0,  21, 104,    2200, 120,   145, D,  0, 0              , 32, R), //  21
+	RVI(18, G,  21, 104,    2200, 120,   145, D,  0, 0              , 32, R), //  21
 	RVI( 6, M,  20, 200,  4500/2,70/2, 190/2, D,  4, CT_MAIL        , 50, R), //  22
-	RVI(20, 0,  26, 160,    3600,  84,   180, E,  0, 0              , 40, C), //  23
-	RVI(20, 0,  30, 176,    5000,  82,   205, E,  0, 0              , 41, C), //  24
+	RVI(20, G,  26, 160,    3600,  84,   180, E,  0, 0              , 40, C), //  23
+	RVI(20, G,  30, 176,    5000,  82,   205, E,  0, 0              , 41, C), //  24
 	RVI(21, M,  40, 240,  7000/2,90/2, 240/2, E,  0, 0              , 51, C), //  25
 	RVI(23, M,  43, 264,  8000/2,95/2, 250/2, E,  0, 0              , 52, C), //  26
 	RVI(33, W, 247,   0,       0,  25,     0, 0, 40, CT_PASSENGERS  ,  0, R), //  27
@@ -400,9 +401,9 @@ const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES] = {
 	RVI(57, W, 196,   0,       0,  18,     0, 0, 22, CT_BATTERIES   ,  0, R), //  51
 	RVI(58, W, 193,   0,       0,  18,     0, 0, 25, CT_FIZZY_DRINKS,  0, R), //  52
 	RVI(59, W, 191,   0,       0,  18,     0, 0, 30, CT_PLASTIC     ,  0, R), //  53
-	RVI(25, 0,  52, 304,    9000,  95,   230, E,  0, 0              , 60, O), //  54
+	RVI(25, G,  52, 304,    9000,  95,   230, E,  0, 0              , 60, O), //  54
 	RVI(26, M,  60, 336, 10000/2,85/2, 240/2, E, 25, CT_PASSENGERS  , 62, O), //  55
-	RVI(26, 0,  53, 320,    5000,  95,   230, E,  0, 0              , 63, O), //  56
+	RVI(26, G,  53, 320,    5000,  95,   230, E,  0, 0              , 63, O), //  56
 	RVI(60, W, 247,   0,       0,  25,     0, 0, 45, CT_PASSENGERS  ,  0, O), //  57
 	RVI(62, W, 228,   0,       0,  21,     0, 0, 35, CT_MAIL        ,  0, O), //  58
 	RVI(61, W, 176,   0,       0,  18,     0, 0, 35, CT_COAL        ,  0, O), //  59
@@ -430,11 +431,11 @@ const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES] = {
 	RVI(57, W, 196,   0,       0,  18,     0, 0, 27, CT_BATTERIES   ,  0, O), //  81
 	RVI(58, W, 193,   0,       0,  18,     0, 0, 30, CT_FIZZY_DRINKS,  0, O), //  82
 	RVI(59, W, 191,   0,       0,  18,     0, 0, 35, CT_PLASTIC     ,  0, O), //  83
-	RVI(28, 0,  70, 400,   10000, 105,   250, E,  0, 0              , 70, L), //  84
-	RVI(29, 0,  74, 448,   12000, 120,   253, E,  0, 0              , 71, L), //  85
-	RVI(30, 0,  82, 480,   15000, 130,   254, E,  0, 0              , 72, L), //  86
+	RVI(28, G,  70, 400,   10000, 105,   250, E,  0, 0              , 70, L), //  84
+	RVI(29, G,  74, 448,   12000, 120,   253, E,  0, 0              , 71, L), //  85
+	RVI(30, G,  82, 480,   15000, 130,   254, E,  0, 0              , 72, L), //  86
 	RVI(31, M,  95, 640, 20000/2,150/2,255/2, E,  0, 0              , 73, L), //  87
-	RVI(28, 0,  70, 480,   10000, 120,   250, E,  0, 0              , 74, L), //  88
+	RVI(28, G,  70, 480,   10000, 120,   250, E,  0, 0              , 74, L), //  88
 	RVI(60, W, 247,   0,       0,  25,     0, 0, 47, CT_PASSENGERS  ,  0, L), //  89
 	RVI(62, W, 228,   0,       0,  21,     0, 0, 37, CT_MAIL        ,  0, L), //  90
 	RVI(61, W, 176,   0,       0,  18,     0, 0, 37, CT_COAL        ,  0, L), //  91
@@ -470,6 +471,7 @@ const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES] = {
 #undef E
 #undef D
 #undef S
+#undef G
 #undef W
 #undef M
 #undef RVI