summaryrefslogtreecommitdiff
path: root/table
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-10-18 11:23:58 +0000
committertron <tron@openttd.org>2005-10-18 11:23:58 +0000
commitf3de17256046ed3286ba17d130c7701a8729ac16 (patch)
tree000f00442c2db76662d897b20b8ca8d16bb0a4ba /table
parentd4752ba0da4c6387020167b3acee938ed14d9a66 (diff)
downloadopenttd-f3de17256046ed3286ba17d130c7701a8729ac16.tar.xz
(svn r3059) Use bitfields to encode railtype and climates of engines instead of manual shifting/anding
Diffstat (limited to 'table')
-rw-r--r--table/engines.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/table/engines.h b/table/engines.h
index b1d6c2976..bba258287 100644
--- a/table/engines.h
+++ b/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