dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit.

Browse Source 
Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2.
This commit is contained in:
Jonathan G Rennison
2017-03-04 23:49:55 +00:00
parent 87142ed840
commit afd8c6b867
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tunnel_base.h
View File

@@ -17,7 +17,7 @@
struct Tunnel;
typedef Pool<Tunnel, TunnelID, 64, 64000> TunnelPool;
typedef Pool<Tunnel, TunnelID, 64, 1048576> TunnelPool;
extern TunnelPool _tunnel_pool;
struct Tunnel : TunnelPool::PoolItem<&_tunnel_pool> {
@@ -27,13 +27,21 @@ struct Tunnel : TunnelPool::PoolItem<&_tunnel_pool> {
bool is_chunnel;
Tunnel() {}
Tunnel(TileIndex tile_n, TileIndex tile_s, bool is_chunnel) : tile_n(tile_n), tile_s(tile_s), is_chunnel(is_chunnel) {}
~Tunnel();
Tunnel(TileIndex tile_n, TileIndex tile_s, bool is_chunnel) : tile_n(tile_n), tile_s(tile_s), is_chunnel(is_chunnel)
{
this->UpdateIndexes();
}
void UpdateIndexes();
static inline Tunnel *GetByTile(TileIndex tile)
{
return Tunnel::Get(GetTunnelIndex(tile));
}
static void PreCleanPool();
};
#define FOR_ALL_TUNNELS_FROM(var, start) FOR_ALL_ITEMS_FROM(Tunnel, tunnel_index, var, start)