mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-12 04:14:05 +00:00
removes useless make_tuple, and changes type of typeIndex to size_t
This commit is contained in:
parent
31330c9abc
commit
85a9edf2ee
@ -271,10 +271,8 @@ namespace MWWorld
|
||||
static int AssignStoreToIndex(ESMStore& stores, Store<T>& store)
|
||||
{
|
||||
const int storeIndex = ESMStore::getTypeIndex<T>();
|
||||
assert(ESMStore::getTypeIndex<T>() == storeIndex);
|
||||
const std::size_t index_t(storeIndex);
|
||||
if (stores.mStores.size() <= index_t)
|
||||
stores.mStores.resize(index_t + 1);
|
||||
if (stores.mStores.size() <= storeIndex)
|
||||
stores.mStores.resize(storeIndex + 1);
|
||||
|
||||
assert(&store == &std::get<Store<T>>(stores.mStoreImp->mStores));
|
||||
|
||||
@ -330,7 +328,7 @@ namespace MWWorld
|
||||
ESMStore::ESMStore()
|
||||
{
|
||||
mStoreImp = std::make_unique<ESMStoreImp>(*this);
|
||||
std::apply([this](auto& ...x){std::make_tuple(ESMStoreImp::AssignStoreToIndex(*this, x)...);} , mStoreImp->mStores);
|
||||
std::apply([this](auto& ...x) {(ESMStoreImp::AssignStoreToIndex(*this, x), ...); }, mStoreImp->mStores);
|
||||
mDynamicCount = 0;
|
||||
mStoreImp->SetupAfterStoresCreation(*this);
|
||||
getWritable<ESM::Pathgrid>().setCells(getWritable<ESM::Cell>());
|
||||
@ -437,9 +435,9 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialo
|
||||
}
|
||||
}
|
||||
|
||||
static int sTypeIndexCounter = 0;
|
||||
static std::size_t sTypeIndexCounter = 0;
|
||||
|
||||
int& ESMStore::getTypeIndexCounter()
|
||||
std::size_t& ESMStore::getTypeIndexCounter()
|
||||
{
|
||||
return sTypeIndexCounter;
|
||||
}
|
||||
|
@ -31,12 +31,12 @@ namespace MWWorld
|
||||
{
|
||||
friend struct ESMStoreImp; //This allows StoreImp to extend esmstore without beeing included everywhere
|
||||
|
||||
static int& getTypeIndexCounter();
|
||||
static std::size_t &getTypeIndexCounter();
|
||||
|
||||
template<typename T>
|
||||
static int getTypeIndex()
|
||||
static std::size_t getTypeIndex()
|
||||
{
|
||||
static int index = getTypeIndexCounter()++;
|
||||
static std::size_t index = getTypeIndexCounter()++;
|
||||
return index;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user