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

Use btree set for _changed_storage_arrays

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-08-19 16:20:11 +01:00
parent 53ef4536d9
commit 1979fa9db1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_storage.cpp
View File

@@ -12,7 +12,7 @@
#include "core/pool_func.hpp" #include "core/pool_func.hpp"
#include "core/endian_func.hpp" #include "core/endian_func.hpp"
#include "debug.h" #include "debug.h"
#include <set> #include "3rdparty/cpp-btree/btree_set.h"
#include "safeguards.h" #include "safeguards.h"
@@ -20,7 +20,7 @@ PersistentStoragePool _persistent_storage_pool("PersistentStorage");
INSTANTIATE_POOL_METHODS(PersistentStorage) INSTANTIATE_POOL_METHODS(PersistentStorage)
/** The changed storage arrays */ /** The changed storage arrays */
static std::set<BasePersistentStorageArray*> *_changed_storage_arrays = new std::set<BasePersistentStorageArray*>; static btree::btree_set<BasePersistentStorageArray*> _changed_storage_arrays;
bool BasePersistentStorageArray::gameloop; bool BasePersistentStorageArray::gameloop;
bool BasePersistentStorageArray::command; bool BasePersistentStorageArray::command;
@@ -31,7 +31,7 @@ bool BasePersistentStorageArray::testmode;
*/ */
BasePersistentStorageArray::~BasePersistentStorageArray() BasePersistentStorageArray::~BasePersistentStorageArray()
{ {
_changed_storage_arrays->erase(this); _changed_storage_arrays.erase(this);
} }
/** /**
@@ -42,7 +42,7 @@ BasePersistentStorageArray::~BasePersistentStorageArray()
*/ */
void AddChangedPersistentStorage(BasePersistentStorageArray *storage) void AddChangedPersistentStorage(BasePersistentStorageArray *storage)
{ {
_changed_storage_arrays->insert(storage); _changed_storage_arrays.insert(storage);
} }
/** /**
@@ -91,9 +91,9 @@ void AddChangedPersistentStorage(BasePersistentStorageArray *storage)
} }
/* Discard all temporary changes */ /* Discard all temporary changes */
for (auto &it : *_changed_storage_arrays) { for (auto &it : _changed_storage_arrays) {
DEBUG(desync, 1, "Discarding persistent storage changes: Feature %d, GrfID %08X, Tile %d", it->feature, BSWAP32(it->grfid), it->tile); DEBUG(desync, 1, "Discarding persistent storage changes: Feature %d, GrfID %08X, Tile %d", it->feature, BSWAP32(it->grfid), it->tile);
it->ClearChanges(); it->ClearChanges();
} }
_changed_storage_arrays->clear(); _changed_storage_arrays.clear();
} }