(svn r3059) Use bitfields to encode railtype and climates of engines instead of manual shifting/anding

table/engines.h

@@ -15,7 +15,7 @@
   * @param e Rail Type of the vehicle
   * @param f Bitmask of the climates
   */
-#define MK(a,b,c,d,e,f) {a,b,c,d,((e)<<4)|(f)}
+#define MK(a, b, c, d, e, f) { a, b, c, d, e, f }
 /** Writes the properties of a train carriage into the EngineInfo struct.
   * @see EngineInfo
   * @param a Introduction date
@@ -23,7 +23,7 @@
   * @param f Bitmask of the climates
   * @note the 0x80 in parameter b sets the "is carriage bit"
   */
-#define MW(a,b,c,d,e,f) {a,b|0x80,c,d,((e)<<4)|(f)}
+#define MW(a, b, c, d, e, f) { a, b | 0x80, c, d, e, f }
 
 // Rail types
 // R = Conventional railway