summaryrefslogtreecommitdiff
path: root/src/water_map.h
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2008-02-06 15:32:06 +0000
committerfrosch <frosch@openttd.org>2008-02-06 15:32:06 +0000
commite95e8877721a35b5e9c6761f4c40a8a0396a9168 (patch)
treeb5b474ed58e225718126beb6492afa26fc617e6e /src/water_map.h
parent94f421798447a1362ea861308453ae2d30cab839 (diff)
downloadopenttd-e95e8877721a35b5e9c6761f4c40a8a0396a9168.tar.xz
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
Diffstat (limited to 'src/water_map.h')
-rw-r--r--src/water_map.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/water_map.h b/src/water_map.h
index b9bb4344a..ca3ba061a 100644
--- a/src/water_map.h
+++ b/src/water_map.h
@@ -106,9 +106,9 @@ static inline DiagDirection GetShipDepotDirection(TileIndex t)
return XYNSToDiagDir(GetShipDepotAxis(t), GB(_m[t].m5, 0, 1));
}
-static inline Owner GetShipDepotWaterOwner(TileIndex t)
+static inline bool IsLock(TileIndex t)
{
- return (Owner)_m[t].m4;
+ return IsInsideMM(_m[t].m5, LOCK_MIDDLE, LOCK_END);
}
static inline DiagDirection GetLockDirection(TileIndex t)
@@ -169,13 +169,13 @@ static inline void MakeCanal(TileIndex t, Owner o, uint8 random_bits)
_m[t].m5 = 0;
}
-static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a, WaterClass original_water_class, Owner original_owner)
+static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a, WaterClass original_water_class)
{
SetTileType(t, MP_WATER);
SetTileOwner(t, o);
_m[t].m2 = 0;
_m[t].m3 = original_water_class;
- _m[t].m4 = original_owner;
+ _m[t].m4 = 0;
_m[t].m5 = base + a * 2;
}