summaryrefslogtreecommitdiff
path: root/src/clear_map.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-09-21 11:20:11 +0000
committerrubidium <rubidium@openttd.org>2014-09-21 11:20:11 +0000
commit0ac2d3b3247041e0690e12ac7270dde5377390de (patch)
tree987d8921b28b3ef2c33daf71fa7db98322b4e52e /src/clear_map.h
parent47852f119eebc2816bd829b85ee4d105d1520e21 (diff)
downloadopenttd-0ac2d3b3247041e0690e12ac7270dde5377390de.tar.xz
(svn r26876) -Codechange: move 'has bride above' data from m6 to type
Diffstat (limited to 'src/clear_map.h')
-rw-r--r--src/clear_map.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/clear_map.h b/src/clear_map.h
index ca1d1043e..db638ca6c 100644
--- a/src/clear_map.h
+++ b/src/clear_map.h
@@ -260,10 +260,6 @@ static inline void SetFence(TileIndex t, DiagDirection side, uint h)
*/
static inline void MakeClear(TileIndex t, ClearGround g, uint density)
{
- /* If this is a non-bridgeable tile, clear the bridge bits while the rest
- * of the tile information is still here. */
- if (!MayHaveBridgeAbove(t)) SB(_m[t].m6, 6, 2, 0);
-
SetTileType(t, MP_CLEAR);
_m[t].m1 = 0;
SetTileOwner(t, OWNER_NONE);
@@ -271,7 +267,7 @@ static inline void MakeClear(TileIndex t, ClearGround g, uint density)
_m[t].m3 = 0;
_m[t].m4 = 0 << 5 | 0 << 2;
SetClearGroundDensity(t, g, density); // Sets m5
- SB(_m[t].m6, 2, 4, 0); // Other bits are "tropic zone" and "bridge above"
+ _m[t].m6 = 0;
_me[t].m7 = 0;
}