diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-01-23 16:29:36 +0100 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-01-23 16:29:36 +0100 |
commit | 9eb599ff58fcc9d3f89872a548fcf2221c65061f (patch) | |
tree | 6e25b762d26b51ed9f6778543b543c7d6b79e889 /src/modelinfo | |
parent | ConstructMloClumps (diff) | |
download | re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.tar re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.tar.gz re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.tar.bz2 re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.tar.lz re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.tar.xz re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.tar.zst re3-9eb599ff58fcc9d3f89872a548fcf2221c65061f.zip |
Diffstat (limited to 'src/modelinfo')
-rw-r--r-- | src/modelinfo/MloModelInfo.cpp | 4 | ||||
-rw-r--r-- | src/modelinfo/ModelInfo.cpp | 4 | ||||
-rw-r--r-- | src/modelinfo/ModelInfo.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/modelinfo/MloModelInfo.cpp b/src/modelinfo/MloModelInfo.cpp index 693f1fb6..746d9db4 100644 --- a/src/modelinfo/MloModelInfo.cpp +++ b/src/modelinfo/MloModelInfo.cpp @@ -12,8 +12,8 @@ CMloModelInfo::ConstructClump() RpClumpSetFrame(m_clump, mainFrame); for (int i = firstInstance; i < lastInstance; i++) { - int modelId = CModelInfo::GetMloInstanceStore()->store[i].m_modelIndex; - RwMatrix *attMat = CModelInfo::GetMloInstanceStore()->store[i].GetMatrix().m_attachment; + int modelId = CModelInfo::GetMloInstanceStore().store[i].m_modelIndex; + RwMatrix *attMat = CModelInfo::GetMloInstanceStore().store[i].GetMatrix().m_attachment; CSimpleModelInfo *minfo = (CSimpleModelInfo*)CModelInfo::GetModelInfo(modelId); if (minfo->m_atomics[0] != nil) { diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp index c41320e2..a3c1412d 100644 --- a/src/modelinfo/ModelInfo.cpp +++ b/src/modelinfo/ModelInfo.cpp @@ -218,10 +218,10 @@ CModelInfo::RemoveColModelsFromOtherLevels(eLevelName level) } } -CStore<CInstance, MLOINSTANCESIZE>* +CStore<CInstance, MLOINSTANCESIZE>& CModelInfo::GetMloInstanceStore() { - return &CModelInfo::ms_mloInstanceStore; + return CModelInfo::ms_mloInstanceStore; } void diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h index 3835117e..13756ddf 100644 --- a/src/modelinfo/ModelInfo.h +++ b/src/modelinfo/ModelInfo.h @@ -36,6 +36,7 @@ public: static CVehicleModelInfo *AddVehicleModel(int id); static CStore<C2dEffect, TWODFXSIZE> &Get2dEffectStore(void) { return ms_2dEffectStore; } + static CStore<CInstance, MLOINSTANCESIZE> &GetMloInstanceStore(); static CBaseModelInfo *GetModelInfo(const char *name, int *id); static CBaseModelInfo *GetModelInfo(int id){ @@ -45,6 +46,5 @@ public: static bool IsBoatModel(int32 id); static bool IsBikeModel(int32 id); static void RemoveColModelsFromOtherLevels(eLevelName level); - static CStore<CInstance, MLOINSTANCESIZE>* CModelInfo::GetMloInstanceStore(); static void ConstructMloClumps(); }; |