1 files changed, 2 insertions, 2 deletions
diff --git a/src/object_map.h b/src/object_map.h
index 3c185b14b..85faf4444 100644
--- a/src/object_map.h
+++ b/src/object_map.h
@@ -49,7 +49,7 @@ static inline bool IsObjectTypeTile(TileIndex t, ObjectType type)
 static inline ObjectID GetObjectIndex(TileIndex t)
 {
 	assert(IsTileType(t, MP_OBJECT));
-	return _m[t].m2;
+	return _m[t].m2 | _m[t].m5 << 16;
 }
 
 /**
@@ -81,7 +81,7 @@ static inline void MakeObject(TileIndex t, Owner o, ObjectID index, WaterClass w
 	_m[t].m2 = index;
 	_m[t].m3 = random;
 	_m[t].m4 = 0;
-	_m[t].m5 = 0;
+	_m[t].m5 = index >> 16;
 	SB(_m[t].m6, 2, 4, 0);
 	_me[t].m7 = 0;
 }