petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M.

Browse Source
This commit is contained in:
frosch
2013-10-12 16:35:50 +00:00
parent 29f5eab56c
commit 69a0c91d63
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_map.h
View File

@@ -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;
}