mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r7331) - Codechange: Rename all memory pool macro's and types to "old pool", so the new pool implementation can be committed alongside it.
- Codechange: Rename pool.[ch] to oldpool.[ch].
This commit is contained in:
parent
e205c58ddc
commit
231111ce3d
2
Makefile
2
Makefile
|
@ -741,6 +741,7 @@ SRCS += newgrf_text.c
|
||||||
SRCS += news_gui.c
|
SRCS += news_gui.c
|
||||||
SRCS += npf.c
|
SRCS += npf.c
|
||||||
SRCS += oldloader.c
|
SRCS += oldloader.c
|
||||||
|
SRCS += oldpool.c
|
||||||
SRCS += openttd.c
|
SRCS += openttd.c
|
||||||
SRCS += order_cmd.c
|
SRCS += order_cmd.c
|
||||||
SRCS += order_gui.c
|
SRCS += order_gui.c
|
||||||
|
@ -748,7 +749,6 @@ SRCS += os_timer.c
|
||||||
SRCS += pathfind.c
|
SRCS += pathfind.c
|
||||||
SRCS += player_gui.c
|
SRCS += player_gui.c
|
||||||
SRCS += players.c
|
SRCS += players.c
|
||||||
SRCS += pool.c
|
|
||||||
SRCS += queue.c
|
SRCS += queue.c
|
||||||
SRCS += rail.c
|
SRCS += rail.c
|
||||||
SRCS += rail_cmd.c
|
SRCS += rail_cmd.c
|
||||||
|
|
2
depot.c
2
depot.c
|
@ -23,7 +23,7 @@ static void DepotPoolNewBlock(uint start_item)
|
||||||
for (d = GetDepot(start_item); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) d->index = start_item++;
|
for (d = GetDepot(start_item); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) d->index = start_item++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_POOL(Depot, Depot, DepotPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Depot, Depot, DepotPoolNewBlock, NULL)
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
4
depot.h
4
depot.h
|
@ -7,7 +7,7 @@
|
||||||
* @see depot.c */
|
* @see depot.c */
|
||||||
|
|
||||||
#include "direction.h"
|
#include "direction.h"
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "tile.h"
|
#include "tile.h"
|
||||||
#include "variables.h"
|
#include "variables.h"
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ struct Depot {
|
||||||
DepotID index;
|
DepotID index;
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_POOL(Depot, Depot, 3, 8000)
|
DECLARE_OLD_POOL(Depot, Depot, 3, 8000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a depot really exists.
|
* Check if a depot really exists.
|
||||||
|
|
2
engine.c
2
engine.c
|
@ -431,7 +431,7 @@ bool IsEngineBuildable(EngineID engine, byte type, PlayerID player)
|
||||||
|
|
||||||
static void EngineRenewPoolNewBlock(uint start_item);
|
static void EngineRenewPoolNewBlock(uint start_item);
|
||||||
|
|
||||||
DEFINE_POOL(EngineRenew, EngineRenew, EngineRenewPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(EngineRenew, EngineRenew, EngineRenewPoolNewBlock, NULL)
|
||||||
|
|
||||||
static void EngineRenewPoolNewBlock(uint start_item)
|
static void EngineRenewPoolNewBlock(uint start_item)
|
||||||
{
|
{
|
||||||
|
|
4
engine.h
4
engine.h
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
/** @file engine.h */
|
/** @file engine.h */
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
|
|
||||||
typedef struct RailVehicleInfo {
|
typedef struct RailVehicleInfo {
|
||||||
byte image_index;
|
byte image_index;
|
||||||
|
@ -235,7 +235,7 @@ typedef struct EngineRenew EngineRenew;
|
||||||
* placed here so the only exception to this rule, the saveload code, can use
|
* placed here so the only exception to this rule, the saveload code, can use
|
||||||
* it.
|
* it.
|
||||||
*/
|
*/
|
||||||
DECLARE_POOL(EngineRenew, EngineRenew, 3, 8000)
|
DECLARE_OLD_POOL(EngineRenew, EngineRenew, 3, 8000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a EngineRenew really exists.
|
* Check if a EngineRenew really exists.
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifndef INDUSTRY_H
|
#ifndef INDUSTRY_H
|
||||||
#define INDUSTRY_H
|
#define INDUSTRY_H
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
|
|
||||||
typedef byte IndustryGfx;
|
typedef byte IndustryGfx;
|
||||||
typedef uint8 IndustryType;
|
typedef uint8 IndustryType;
|
||||||
|
@ -80,7 +80,7 @@ typedef struct IndustrySpec {
|
||||||
|
|
||||||
const IndustrySpec *GetIndustrySpec(IndustryType thistype);
|
const IndustrySpec *GetIndustrySpec(IndustryType thistype);
|
||||||
|
|
||||||
DECLARE_POOL(Industry, Industry, 3, 8000)
|
DECLARE_OLD_POOL(Industry, Industry, 3, 8000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if an Industry really exists.
|
* Check if an Industry really exists.
|
||||||
|
|
|
@ -45,7 +45,7 @@ static void IndustryPoolNewBlock(uint start_item)
|
||||||
for (i = GetIndustry(start_item); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) i->index = start_item++;
|
for (i = GetIndustry(start_item); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) i->index = start_item++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_POOL(Industry, Industry, IndustryPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Industry, Industry, IndustryPoolNewBlock, NULL)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve the type for this industry. Although it is accessed by a tile,
|
* Retrieve the type for this industry. Although it is accessed by a tile,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
#include "newgrf_sound.h"
|
#include "newgrf_sound.h"
|
||||||
|
|
||||||
static uint _sound_count = 0;
|
static uint _sound_count = 0;
|
||||||
STATIC_POOL(SoundInternal, FileEntry, 3, 1000, NULL, NULL)
|
STATIC_OLD_POOL(SoundInternal, FileEntry, 3, 1000, NULL, NULL)
|
||||||
|
|
||||||
|
|
||||||
/* Allocate a new FileEntry */
|
/* Allocate a new FileEntry */
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "variables.h"
|
#include "variables.h"
|
||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "newgrf_spritegroup.h"
|
#include "newgrf_spritegroup.h"
|
||||||
#include "date.h"
|
#include "date.h"
|
||||||
|
|
||||||
static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item);
|
static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item);
|
||||||
|
|
||||||
static uint _spritegroup_count = 0;
|
static uint _spritegroup_count = 0;
|
||||||
STATIC_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock)
|
STATIC_OLD_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock)
|
||||||
|
|
||||||
static void DestroySpriteGroup(SpriteGroup *group)
|
static void DestroySpriteGroup(SpriteGroup *group)
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "functions.h"
|
#include "functions.h"
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clean a pool in a safe way (does free all blocks)
|
* Clean a pool in a safe way (does free all blocks)
|
||||||
*/
|
*/
|
||||||
void CleanPool(MemoryPool *pool)
|
void CleanPool(OldMemoryPool *pool)
|
||||||
{
|
{
|
||||||
uint i;
|
uint i;
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ void CleanPool(MemoryPool *pool)
|
||||||
*
|
*
|
||||||
* @return Returns false if the pool could not be increased
|
* @return Returns false if the pool could not be increased
|
||||||
*/
|
*/
|
||||||
bool AddBlockToPool(MemoryPool *pool)
|
bool AddBlockToPool(OldMemoryPool *pool)
|
||||||
{
|
{
|
||||||
/* Is the pool at his max? */
|
/* Is the pool at his max? */
|
||||||
if (pool->max_blocks == pool->current_blocks)
|
if (pool->max_blocks == pool->current_blocks)
|
||||||
|
@ -76,7 +76,7 @@ bool AddBlockToPool(MemoryPool *pool)
|
||||||
*
|
*
|
||||||
* @return Returns false if adding failed
|
* @return Returns false if adding failed
|
||||||
*/
|
*/
|
||||||
bool AddBlockIfNeeded(MemoryPool *pool, uint index)
|
bool AddBlockIfNeeded(OldMemoryPool *pool, uint index)
|
||||||
{
|
{
|
||||||
while (index >= pool->total_items) {
|
while (index >= pool->total_items) {
|
||||||
if (!AddBlockToPool(pool))
|
if (!AddBlockToPool(pool))
|
|
@ -3,19 +3,19 @@
|
||||||
#ifndef POOL_H
|
#ifndef POOL_H
|
||||||
#define POOL_H
|
#define POOL_H
|
||||||
|
|
||||||
typedef struct MemoryPool MemoryPool;
|
typedef struct OldMemoryPool OldMemoryPool;
|
||||||
|
|
||||||
/* The function that is called after a new block is added
|
/* The function that is called after a new block is added
|
||||||
start_item is the first item of the new made block */
|
start_item is the first item of the new made block */
|
||||||
typedef void MemoryPoolNewBlock(uint start_item);
|
typedef void OldMemoryPoolNewBlock(uint start_item);
|
||||||
/* The function that is called before a block is cleaned up */
|
/* The function that is called before a block is cleaned up */
|
||||||
typedef void MemoryPoolCleanBlock(uint start_item, uint end_item);
|
typedef void OldMemoryPoolCleanBlock(uint start_item, uint end_item);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stuff for dynamic vehicles. Use the wrappers to access the MemoryPool
|
* Stuff for dynamic vehicles. Use the wrappers to access the OldMemoryPool
|
||||||
* please try to avoid manual calls!
|
* please try to avoid manual calls!
|
||||||
*/
|
*/
|
||||||
struct MemoryPool {
|
struct OldMemoryPool {
|
||||||
const char* const name; ///< Name of the pool (just for debugging)
|
const char* const name; ///< Name of the pool (just for debugging)
|
||||||
|
|
||||||
const uint max_blocks; ///< The max amount of blocks this pool can have
|
const uint max_blocks; ///< The max amount of blocks this pool can have
|
||||||
|
@ -23,9 +23,9 @@ struct MemoryPool {
|
||||||
const uint item_size; ///< How many bytes one block is
|
const uint item_size; ///< How many bytes one block is
|
||||||
|
|
||||||
/// Pointer to a function that is called after a new block is added
|
/// Pointer to a function that is called after a new block is added
|
||||||
MemoryPoolNewBlock *new_block_proc;
|
OldMemoryPoolNewBlock *new_block_proc;
|
||||||
/// Pointer to a function that is called to clean a block
|
/// Pointer to a function that is called to clean a block
|
||||||
MemoryPoolCleanBlock *clean_block_proc;
|
OldMemoryPoolCleanBlock *clean_block_proc;
|
||||||
|
|
||||||
uint current_blocks; ///< How many blocks we have in our pool
|
uint current_blocks; ///< How many blocks we have in our pool
|
||||||
uint total_items; ///< How many items we now have in this pool
|
uint total_items; ///< How many items we now have in this pool
|
||||||
|
@ -40,25 +40,25 @@ struct MemoryPool {
|
||||||
* AddBlockToPool adds 1 more block to the pool. Returns false if there is no
|
* AddBlockToPool adds 1 more block to the pool. Returns false if there is no
|
||||||
* more room
|
* more room
|
||||||
*/
|
*/
|
||||||
void CleanPool(MemoryPool *array);
|
void CleanPool(OldMemoryPool *array);
|
||||||
bool AddBlockToPool(MemoryPool *array);
|
bool AddBlockToPool(OldMemoryPool *array);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds blocks to the pool if needed (and possible) till index fits inside the pool
|
* Adds blocks to the pool if needed (and possible) till index fits inside the pool
|
||||||
*
|
*
|
||||||
* @return Returns false if adding failed
|
* @return Returns false if adding failed
|
||||||
*/
|
*/
|
||||||
bool AddBlockIfNeeded(MemoryPool *array, uint index);
|
bool AddBlockIfNeeded(OldMemoryPool *array, uint index);
|
||||||
|
|
||||||
|
|
||||||
#define POOL_ENUM(name, type, block_size_bits, max_blocks) \
|
#define OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \
|
||||||
enum { \
|
enum { \
|
||||||
name##_POOL_BLOCK_SIZE_BITS = block_size_bits, \
|
name##_POOL_BLOCK_SIZE_BITS = block_size_bits, \
|
||||||
name##_POOL_MAX_BLOCKS = max_blocks \
|
name##_POOL_MAX_BLOCKS = max_blocks \
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define POOL_ACCESSORS(name, type) \
|
#define OLD_POOL_ACCESSORS(name, type) \
|
||||||
static inline type* Get##name(uint index) \
|
static inline type* Get##name(uint index) \
|
||||||
{ \
|
{ \
|
||||||
assert(index < _##name##_pool.total_items); \
|
assert(index < _##name##_pool.total_items); \
|
||||||
|
@ -74,23 +74,23 @@ bool AddBlockIfNeeded(MemoryPool *array, uint index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define DECLARE_POOL(name, type, block_size_bits, max_blocks) \
|
#define DECLARE_OLD_POOL(name, type, block_size_bits, max_blocks) \
|
||||||
POOL_ENUM(name, type, block_size_bits, max_blocks) \
|
OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \
|
||||||
extern MemoryPool _##name##_pool; \
|
extern OldMemoryPool _##name##_pool; \
|
||||||
POOL_ACCESSORS(name, type)
|
OLD_POOL_ACCESSORS(name, type)
|
||||||
|
|
||||||
|
|
||||||
#define DEFINE_POOL(name, type, new_block_proc, clean_block_proc) \
|
#define DEFINE_OLD_POOL(name, type, new_block_proc, clean_block_proc) \
|
||||||
MemoryPool _##name##_pool = { \
|
OldMemoryPool _##name##_pool = { \
|
||||||
#name, name##_POOL_MAX_BLOCKS, name##_POOL_BLOCK_SIZE_BITS, sizeof(type), \
|
#name, name##_POOL_MAX_BLOCKS, name##_POOL_BLOCK_SIZE_BITS, sizeof(type), \
|
||||||
new_block_proc, clean_block_proc, \
|
new_block_proc, clean_block_proc, \
|
||||||
0, 0, NULL \
|
0, 0, NULL \
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define STATIC_POOL(name, type, block_size_bits, max_blocks, new_block_proc, clean_block_proc) \
|
#define STATIC_OLD_POOL(name, type, block_size_bits, max_blocks, new_block_proc, clean_block_proc) \
|
||||||
POOL_ENUM(name, type, block_size_bits, max_blocks) \
|
OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \
|
||||||
static DEFINE_POOL(name, type, new_block_proc, clean_block_proc) \
|
static DEFINE_OLD_POOL(name, type, new_block_proc, clean_block_proc) \
|
||||||
POOL_ACCESSORS(name, type)
|
OLD_POOL_ACCESSORS(name, type)
|
||||||
|
|
||||||
#endif /* POOL_H */
|
#endif /* POOL_H */
|
|
@ -1687,7 +1687,7 @@ WVList
|
||||||
387
|
387
|
||||||
MItem
|
MItem
|
||||||
6
|
6
|
||||||
pool.c
|
oldpool.c
|
||||||
388
|
388
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
|
|
|
@ -361,7 +361,7 @@
|
||||||
RelativePath="players.c">
|
RelativePath="players.c">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pool.c">
|
RelativePath=".\oldpool.c">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\queue.c">
|
RelativePath=".\queue.c">
|
||||||
|
@ -611,7 +611,7 @@
|
||||||
RelativePath=".\player.h">
|
RelativePath=".\player.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pool.h">
|
RelativePath=".\oldpool.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\queue.h">
|
RelativePath=".\queue.h">
|
||||||
|
|
|
@ -729,7 +729,7 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pool.c"
|
RelativePath=".\oldpool.c"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
|
@ -1112,7 +1112,7 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pool.h"
|
RelativePath=".\oldpool.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
|
|
4
order.h
4
order.h
|
@ -6,7 +6,7 @@
|
||||||
#define ORDER_H
|
#define ORDER_H
|
||||||
|
|
||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
INVALID_VEH_ORDER_ID = 0xFF,
|
INVALID_VEH_ORDER_ID = 0xFF,
|
||||||
|
@ -107,7 +107,7 @@ typedef struct {
|
||||||
VARDEF TileIndex _backup_orders_tile;
|
VARDEF TileIndex _backup_orders_tile;
|
||||||
VARDEF BackuppedOrders _backup_orders_data[1];
|
VARDEF BackuppedOrders _backup_orders_data[1];
|
||||||
|
|
||||||
DECLARE_POOL(Order, Order, 6, 1000)
|
DECLARE_OLD_POOL(Order, Order, 6, 1000)
|
||||||
|
|
||||||
static inline VehicleOrderID GetOrderArraySize(void)
|
static inline VehicleOrderID GetOrderArraySize(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,7 @@ static void OrderPoolNewBlock(uint start_item)
|
||||||
for (order = GetOrder(start_item); order != NULL; order = (order->index + 1U < GetOrderPoolSize()) ? GetOrder(order->index + 1U) : NULL) order->index = start_item++;
|
for (order = GetOrder(start_item); order != NULL; order = (order->index + 1U < GetOrderPoolSize()) ? GetOrder(order->index + 1U) : NULL) order->index = start_item++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_POOL(Order, Order, OrderPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Order, Order, OrderPoolNewBlock, NULL)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
2
player.h
2
player.h
|
@ -3,7 +3,7 @@
|
||||||
#ifndef PLAYER_H
|
#ifndef PLAYER_H
|
||||||
#define PLAYER_H
|
#define PLAYER_H
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "aystar.h"
|
#include "aystar.h"
|
||||||
#include "rail.h"
|
#include "rail.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
|
|
@ -1056,7 +1056,7 @@ typedef struct ThreadedSave {
|
||||||
} ThreadedSave;
|
} ThreadedSave;
|
||||||
|
|
||||||
/* A maximum size of of 128K * 500 = 64.000KB savegames */
|
/* A maximum size of of 128K * 500 = 64.000KB savegames */
|
||||||
STATIC_POOL(Savegame, byte, 17, 500, NULL, NULL)
|
STATIC_OLD_POOL(Savegame, byte, 17, 500, NULL, NULL)
|
||||||
static ThreadedSave _ts;
|
static ThreadedSave _ts;
|
||||||
|
|
||||||
static bool InitMem(void)
|
static bool InitMem(void)
|
||||||
|
|
2
signs.c
2
signs.c
|
@ -25,7 +25,7 @@ static void SignPoolNewBlock(uint start_item)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize the sign-pool */
|
/* Initialize the sign-pool */
|
||||||
DEFINE_POOL(Sign, Sign, SignPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Sign, Sign, SignPoolNewBlock, NULL)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
4
signs.h
4
signs.h
|
@ -3,7 +3,7 @@
|
||||||
#ifndef SIGNS_H
|
#ifndef SIGNS_H
|
||||||
#define SIGNS_H
|
#define SIGNS_H
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
|
|
||||||
typedef struct Sign {
|
typedef struct Sign {
|
||||||
StringID str;
|
StringID str;
|
||||||
|
@ -16,7 +16,7 @@ typedef struct Sign {
|
||||||
SignID index;
|
SignID index;
|
||||||
} Sign;
|
} Sign;
|
||||||
|
|
||||||
DECLARE_POOL(Sign, Sign, 2, 16000)
|
DECLARE_OLD_POOL(Sign, Sign, 2, 16000)
|
||||||
|
|
||||||
static inline SignID GetSignArraySize(void)
|
static inline SignID GetSignArraySize(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#define STATION_H
|
#define STATION_H
|
||||||
|
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "sprite.h"
|
#include "sprite.h"
|
||||||
#include "tile.h"
|
#include "tile.h"
|
||||||
#include "newgrf_station.h"
|
#include "newgrf_station.h"
|
||||||
|
@ -142,7 +142,7 @@ void UpdateAllStationVirtCoord(void);
|
||||||
void RebuildStationLists(void);
|
void RebuildStationLists(void);
|
||||||
void ResortStationLists(void);
|
void ResortStationLists(void);
|
||||||
|
|
||||||
DECLARE_POOL(Station, Station, 6, 1000)
|
DECLARE_OLD_POOL(Station, Station, 6, 1000)
|
||||||
|
|
||||||
static inline StationID GetStationArraySize(void)
|
static inline StationID GetStationArraySize(void)
|
||||||
{
|
{
|
||||||
|
@ -181,7 +181,7 @@ static inline void DeleteStation(Station *st)
|
||||||
|
|
||||||
/* Stuff for ROADSTOPS */
|
/* Stuff for ROADSTOPS */
|
||||||
|
|
||||||
DECLARE_POOL(RoadStop, RoadStop, 5, 2000)
|
DECLARE_OLD_POOL(RoadStop, RoadStop, 5, 2000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a RaodStop really exists.
|
* Check if a RaodStop really exists.
|
||||||
|
|
|
@ -68,8 +68,8 @@ static void RoadStopPoolNewBlock(uint start_item)
|
||||||
for (rs = GetRoadStop(start_item); rs != NULL; rs = (rs->index + 1U < GetRoadStopPoolSize()) ? GetRoadStop(rs->index + 1U) : NULL) rs->index = start_item++;
|
for (rs = GetRoadStop(start_item); rs != NULL; rs = (rs->index + 1U < GetRoadStopPoolSize()) ? GetRoadStop(rs->index + 1U) : NULL) rs->index = start_item++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_POOL(Station, Station, StationPoolNewBlock, StationPoolCleanBlock)
|
DEFINE_OLD_POOL(Station, Station, StationPoolNewBlock, StationPoolCleanBlock)
|
||||||
DEFINE_POOL(RoadStop, RoadStop, RoadStopPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(RoadStop, RoadStop, RoadStopPoolNewBlock, NULL)
|
||||||
|
|
||||||
|
|
||||||
extern void UpdateAirplanesOnNewStation(Station *st);
|
extern void UpdateAirplanesOnNewStation(Station *st);
|
||||||
|
|
4
town.h
4
town.h
|
@ -3,7 +3,7 @@
|
||||||
#ifndef TOWN_H
|
#ifndef TOWN_H
|
||||||
#define TOWN_H
|
#define TOWN_H
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
|
|
||||||
struct Town {
|
struct Town {
|
||||||
|
@ -152,7 +152,7 @@ bool CheckforTownRating(uint32 flags, Town *t, byte type);
|
||||||
|
|
||||||
VARDEF const Town** _town_sort;
|
VARDEF const Town** _town_sort;
|
||||||
|
|
||||||
DECLARE_POOL(Town, Town, 3, 8000)
|
DECLARE_OLD_POOL(Town, Town, 3, 8000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a Town really exists.
|
* Check if a Town really exists.
|
||||||
|
|
|
@ -43,7 +43,7 @@ static void TownPoolNewBlock(uint start_item)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize the town-pool */
|
/* Initialize the town-pool */
|
||||||
DEFINE_POOL(Town, Town, TownPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Town, Town, TownPoolNewBlock, NULL)
|
||||||
|
|
||||||
void DestroyTown(Town *t)
|
void DestroyTown(Town *t)
|
||||||
{
|
{
|
||||||
|
|
|
@ -95,7 +95,7 @@ static void VehiclePoolNewBlock(uint start_item)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize the vehicle-pool */
|
/* Initialize the vehicle-pool */
|
||||||
DEFINE_POOL(Vehicle, Vehicle, VehiclePoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Vehicle, Vehicle, VehiclePoolNewBlock, NULL)
|
||||||
|
|
||||||
void VehicleServiceInDepot(Vehicle *v)
|
void VehicleServiceInDepot(Vehicle *v)
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifndef VEHICLE_H
|
#ifndef VEHICLE_H
|
||||||
#define VEHICLE_H
|
#define VEHICLE_H
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "order.h"
|
#include "order.h"
|
||||||
#include "rail.h"
|
#include "rail.h"
|
||||||
|
|
||||||
|
@ -368,7 +368,7 @@ Direction GetDirectionTowards(const Vehicle* v, int x, int y);
|
||||||
#define BEGIN_ENUM_WAGONS(v) do {
|
#define BEGIN_ENUM_WAGONS(v) do {
|
||||||
#define END_ENUM_WAGONS(v) } while ( (v=v->next) != NULL);
|
#define END_ENUM_WAGONS(v) } while ( (v=v->next) != NULL);
|
||||||
|
|
||||||
DECLARE_POOL(Vehicle, Vehicle, 9, 125)
|
DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125)
|
||||||
|
|
||||||
static inline VehicleID GetVehicleArraySize(void)
|
static inline VehicleID GetVehicleArraySize(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,7 @@ static void WaypointPoolNewBlock(uint start_item)
|
||||||
for (wp = GetWaypoint(start_item); wp != NULL; wp = (wp->index + 1U < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1U) : NULL) wp->index = start_item++;
|
for (wp = GetWaypoint(start_item); wp != NULL; wp = (wp->index + 1U < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1U) : NULL) wp->index = start_item++;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_POOL(Waypoint, Waypoint, WaypointPoolNewBlock, NULL)
|
DEFINE_OLD_POOL(Waypoint, Waypoint, WaypointPoolNewBlock, NULL)
|
||||||
|
|
||||||
/* Create a new waypoint */
|
/* Create a new waypoint */
|
||||||
static Waypoint* AllocateWaypoint(void)
|
static Waypoint* AllocateWaypoint(void)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifndef WAYPOINT_H
|
#ifndef WAYPOINT_H
|
||||||
#define WAYPOINT_H
|
#define WAYPOINT_H
|
||||||
|
|
||||||
#include "pool.h"
|
#include "oldpool.h"
|
||||||
#include "rail_map.h"
|
#include "rail_map.h"
|
||||||
|
|
||||||
struct Waypoint {
|
struct Waypoint {
|
||||||
|
@ -24,7 +24,7 @@ struct Waypoint {
|
||||||
byte deleted; ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted.
|
byte deleted; ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted.
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_POOL(Waypoint, Waypoint, 3, 8000)
|
DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a Waypoint really exists.
|
* Check if a Waypoint really exists.
|
||||||
|
|
Loading…
Reference in New Issue