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

Use a std::vector for Object::counts

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-02-10 23:36:40 +00:00
parent c95a3be243
commit 26dc69ff13
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/object_base.h
View File

@@ -43,6 +43,7 @@ struct Object : ObjectPool::PoolItem<&_object_pool> {
static inline void IncTypeCount(ObjectType type)
{
dbg_assert(type < NUM_OBJECTS);
if (type >= counts.size()) counts.resize(type + 1);
counts[type]++;
}
@@ -54,6 +55,7 @@ struct Object : ObjectPool::PoolItem<&_object_pool> {
static inline void DecTypeCount(ObjectType type)
{
dbg_assert(type < NUM_OBJECTS);
dbg_assert(type < counts.size());
counts[type]--;
}
@@ -65,17 +67,18 @@ struct Object : ObjectPool::PoolItem<&_object_pool> {
static inline uint16 GetTypeCount(ObjectType type)
{
dbg_assert(type < NUM_OBJECTS);
if (type >= counts.size()) return 0;
return counts[type];
}
/** Resets object counts. */
static inline void ResetTypeCounts()
{
memset(&counts, 0, sizeof(counts));
counts.clear();
}
protected:
static uint16 counts[NUM_OBJECTS]; ///< Number of objects per type ingame
static std::vector<uint16> counts; ///< Number of objects per type ingame
};
/**

2
src/object_cmd.cpp
View File

@@ -41,7 +41,7 @@
ObjectPool _object_pool("Object");
INSTANTIATE_POOL_METHODS(Object)
uint16 Object::counts[NUM_OBJECTS];
std::vector<uint16> Object::counts;
/**
* Get the object associated with a tile.