summaryrefslogtreecommitdiff
path: root/src/object_map.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-08-11 14:14:06 +0000
committerrubidium <rubidium@openttd.org>2010-08-11 14:14:06 +0000
commitab5b0ceff219a2b12253dbd3e008cf4551608b8a (patch)
tree015b80c7c79cf97a7de8a1f8d1d82f4577895ea1 /src/object_map.h
parent43d6740f2d68af2223796eb2324086be18487b88 (diff)
downloadopenttd-ab5b0ceff219a2b12253dbd3e008cf4551608b8a.tar.xz
(svn r20446) -Codechange: unify the location of the water class
Diffstat (limited to 'src/object_map.h')
-rw-r--r--src/object_map.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/object_map.h b/src/object_map.h
index f22331640..0f4de9915 100644
--- a/src/object_map.h
+++ b/src/object_map.h
@@ -13,6 +13,7 @@
#define OBJECT_MAP_H
#include "tile_map.h"
+#include "water_map.h"
#include "object_type.h"
/**
@@ -162,11 +163,13 @@ static inline void SetObjectOffset(TileIndex t, uint8 offset)
* @param o The new owner of the tile.
* @param offset The offset to the northern tile of this object.
* @param index Generic index associated with the object type.
+ * @param wc Water class for this obect.
*/
-static inline void MakeObject(TileIndex t, ObjectType u, Owner o, uint8 offset, uint index)
+static inline void MakeObject(TileIndex t, ObjectType u, Owner o, uint8 offset, uint index, WaterClass wc)
{
SetTileType(t, MP_OBJECT);
SetTileOwner(t, o);
+ SetWaterClass(t, wc);
_m[t].m2 = index;
_m[t].m3 = offset;
_m[t].m4 = 0;