diff options
| author | smatz <smatz@openttd.org> | 2009-03-08 16:10:39 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-03-08 16:10:39 +0000 |
| commit | e124aa8fd62f3260d2a127aab1e9bc6f5a303480 (patch) | |
| tree | 093e5d2cab6ed85f891e85bb8d9947464dbc8706 /src/water_map.h | |
| parent | 7c8474da13d295ddb6224fe66c41e4ba4ac0f050 (diff) | |
| download | openttd-e124aa8fd62f3260d2a127aab1e9bc6f5a303480.tar.xz | |
(svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits
Diffstat (limited to 'src/water_map.h')
| -rw-r--r-- | src/water_map.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/water_map.h b/src/water_map.h index a0faab036..be6c22b90 100644 --- a/src/water_map.h +++ b/src/water_map.h @@ -146,6 +146,8 @@ static inline void MakeWater(TileIndex t) _m[t].m3 = WATER_CLASS_SEA; _m[t].m4 = 0; _m[t].m5 = 0; + SB(_m[t].m6, 2, 4, 0); + _me[t].m7 = 0; } static inline void MakeShore(TileIndex t) @@ -156,6 +158,8 @@ static inline void MakeShore(TileIndex t) _m[t].m3 = 0; _m[t].m4 = 0; _m[t].m5 = 1; + SB(_m[t].m6, 2, 4, 0); + _me[t].m7 = 0; } static inline void MakeRiver(TileIndex t, uint8 random_bits) @@ -166,6 +170,8 @@ static inline void MakeRiver(TileIndex t, uint8 random_bits) _m[t].m3 = WATER_CLASS_RIVER; _m[t].m4 = random_bits; _m[t].m5 = 0; + SB(_m[t].m6, 2, 4, 0); + _me[t].m7 = 0; } static inline void MakeCanal(TileIndex t, Owner o, uint8 random_bits) @@ -177,6 +183,8 @@ static inline void MakeCanal(TileIndex t, Owner o, uint8 random_bits) _m[t].m3 = WATER_CLASS_CANAL; _m[t].m4 = random_bits; _m[t].m5 = 0; + SB(_m[t].m6, 2, 4, 0); + _me[t].m7 = 0; } static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a, WaterClass original_water_class) @@ -187,6 +195,8 @@ static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a, W _m[t].m3 = original_water_class; _m[t].m4 = 0; _m[t].m5 = base + a * 2; + SB(_m[t].m6, 2, 4, 0); + _me[t].m7 = 0; } static inline void MakeLockTile(TileIndex t, Owner o, byte section, WaterClass original_water_class) @@ -197,6 +207,8 @@ static inline void MakeLockTile(TileIndex t, Owner o, byte section, WaterClass o _m[t].m3 = original_water_class; _m[t].m4 = 0; _m[t].m5 = section; + SB(_m[t].m6, 2, 4, 0); + _me[t].m7 = 0; } static inline void MakeLock(TileIndex t, Owner o, DiagDirection d, WaterClass wc_lower, WaterClass wc_upper) |