Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8321) -Fix

Browse Source 
Reduce the size of EngineInfo (from 28 to 24 bytes) by moving one of its attributes
This commit is contained in:
tron 2007-01-21 19:00:31 +00:00
parent fb8b0557f9
commit 8ac3272e85
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.h
View File

@ -78,9 +78,9 @@ typedef struct RoadVehicleInfo {
*/ */
typedef struct EngineInfo { typedef struct EngineInfo {
Date base_intro; Date base_intro;
byte unk2; ///< Carriages have the highest bit set in this one
Year lifelength; Year lifelength;
Year base_life; Year base_life;
byte unk2; ///< Carriages have the highest bit set in this one
byte load_amount; byte load_amount;
byte climates; byte climates;
uint32 refit_mask; uint32 refit_mask;

8
src/table/engines.h
View File

@ -15,26 +15,26 @@
* @param e Bitmask of the climates * @param e Bitmask of the climates
* @note the 5 between d and e is the load amount * @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. /** Writes the properties of a train carriage into the EngineInfo struct.
* @see MK * @see MK
* @note the 0x80 in parameter b sets the "is carriage bit" * @note the 0x80 in parameter b sets the "is carriage bit"
* @note the 5 between d and e is the load amount * @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. /** Writes the properties of a ship into the EngineInfo struct.
* @see MK * @see MK
* @note the 10 between d and e is the load amount * @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. /** Writes the properties of an aeroplane into the EngineInfo struct.
* @see MK * @see MK
* @note the 20 between d and e is the load amount * @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 // Climates
// T = Temperate // T = Temperate