diff options
| author | tron <tron@openttd.org> | 2007-01-21 19:00:31 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2007-01-21 19:00:31 +0000 |
| commit | 900113f8d2fa52168198946f1b9cb23561916b48 (patch) | |
| tree | 848589ffb53e5819f3f6977d3062bd7fe33abd47 | |
| parent | 5438336102263c4b875fdc7127274af749e9454a (diff) | |
| download | openttd-900113f8d2fa52168198946f1b9cb23561916b48.tar.xz | |
(svn r8321) -Fix
Reduce the size of EngineInfo (from 28 to 24 bytes) by moving one of its attributes
| -rw-r--r-- | src/engine.h | 2 | ||||
| -rw-r--r-- | src/table/engines.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/engine.h b/src/engine.h index 083f2d69b..ef272f4d7 100644 --- a/src/engine.h +++ b/src/engine.h @@ -78,9 +78,9 @@ typedef struct RoadVehicleInfo { */ typedef struct EngineInfo { Date base_intro; - byte unk2; ///< Carriages have the highest bit set in this one Year lifelength; Year base_life; + byte unk2; ///< Carriages have the highest bit set in this one byte load_amount; byte climates; uint32 refit_mask; diff --git a/src/table/engines.h b/src/table/engines.h index 0093a02b6..4e481974e 100644 --- a/src/table/engines.h +++ b/src/table/engines.h @@ -15,26 +15,26 @@ * @param e Bitmask of the climates * @note the 5 between d and e is the load amount */ -#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, b, c, d, 5, e, 0, 8, 0, 0 } +#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0 } /** Writes the properties of a train carriage into the EngineInfo struct. * @see MK * @note the 0x80 in parameter b sets the "is carriage bit" * @note the 5 between d and e is the load amount */ -#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, b | 0x80, c, d, 5, e, 0, 8, 0, 0 } +#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b | 0x80, 5, e, 0, 8, 0, 0 } /** Writes the properties of a ship into the EngineInfo struct. * @see MK * @note the 10 between d and e is the load amount */ -#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, b, c, d, 10, e, 0, 8, 0, 0 } +#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 10, e, 0, 8, 0, 0 } /** Writes the properties of an aeroplane into the EngineInfo struct. * @see MK * @note the 20 between d and e is the load amount */ -#define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, b, c, d, 20, e, 0, 8, 0, 0 } +#define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 20, e, 0, 8, 0, 0 } // Climates // T = Temperate |