From 9eb599ff58fcc9d3f89872a548fcf2221c65061f Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Thu, 23 Jan 2020 17:29:36 +0200 Subject: Plane crashfix and more --- src/modelinfo/MloModelInfo.cpp | 4 ++-- src/modelinfo/ModelInfo.cpp | 4 ++-- src/modelinfo/ModelInfo.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modelinfo') 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* +CStore& 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 &Get2dEffectStore(void) { return ms_2dEffectStore; } + static CStore &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* CModelInfo::GetMloInstanceStore(); static void ConstructMloClumps(); }; -- cgit v1.2.3