Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

ConstructMloClumps

Browse Source
This commit is contained in:
Sergeanur 2020-01-21 09:47:24 +02:00
parent 06904755d9
commit 77515f04e0
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/FileLoader.cpp
View File

@ -96,7 +96,7 @@ CFileLoader::LoadLevel(const char *filename)
LoadObjectTypes(line + 4); LoadObjectTypes(line + 4);
}else if(strncmp(line, "IPL", 3) == 0){ }else if(strncmp(line, "IPL", 3) == 0){
if(!objectsLoaded){ if(!objectsLoaded){
// CModelInfo::ConstructMloClumps(); CModelInfo::ConstructMloClumps();
CObjectData::Initialise("DATA\\OBJECT.DAT"); CObjectData::Initialise("DATA\\OBJECT.DAT");
objectsLoaded = true; objectsLoaded = true;
} }

6
src/core/ZoneCull.cpp
View File

@ -473,8 +473,8 @@ CCullZone::DoStuffEnteringZone_OneTreadablePlus10m(uint16 i)
int j; int j;
if(i < 6000){ if(i < 6000){
CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = true;; CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = true;
CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled2 = true;; CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled2 = true;
bb = CCullZones::aPointersToBigBuildingsForTreadables[i]; bb = CCullZones::aPointersToBigBuildingsForTreadables[i];
if(bb != -1) if(bb != -1)
CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true; CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true;
@ -492,7 +492,7 @@ CCullZone::DoStuffEnteringZone_OneTreadable(uint16 i)
int j; int j;
if(i < 6000){ if(i < 6000){
CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = true;; CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = true;
bb = CCullZones::aPointersToBigBuildingsForTreadables[i]; bb = CCullZones::aPointersToBigBuildingsForTreadables[i];
if(bb != -1) if(bb != -1)
CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true; CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true;

10
src/modelinfo/ModelInfo.cpp
View File

@ -121,7 +121,7 @@ CModelInfo::AddMloModel(int id)
CMloModelInfo *modelinfo; CMloModelInfo *modelinfo;
modelinfo = CModelInfo::ms_mloModelStore.alloc(); modelinfo = CModelInfo::ms_mloModelStore.alloc();
CModelInfo::ms_modelInfoPtrs[id] = modelinfo; CModelInfo::ms_modelInfoPtrs[id] = modelinfo;
modelinfo->m_clump = 0; modelinfo->m_clump = nil;
modelinfo->firstInstance = 0; modelinfo->firstInstance = 0;
modelinfo->lastInstance = 0; modelinfo->lastInstance = 0;
return modelinfo; return modelinfo;
@ -218,13 +218,19 @@ CModelInfo::RemoveColModelsFromOtherLevels(eLevelName level)
} }
} }
CStore<CInstance, MLOINSTANCESIZE>* CStore<CInstance, MLOINSTANCESIZE>*
CModelInfo::GetMloInstanceStore() CModelInfo::GetMloInstanceStore()
{ {
return &CModelInfo::ms_mloInstanceStore; return &CModelInfo::ms_mloInstanceStore;
} }
void
CModelInfo::ConstructMloClumps()
{
for (int i = 0; i < ms_mloModelStore.allocPtr; i++)
ms_mloModelStore.store[i].ConstructClump();
}
STARTPATCHES STARTPATCHES
InjectHook(0x50B310, CModelInfo::Initialise, PATCH_JUMP); InjectHook(0x50B310, CModelInfo::Initialise, PATCH_JUMP);
InjectHook(0x50B5B0, CModelInfo::ShutDown, PATCH_JUMP); InjectHook(0x50B5B0, CModelInfo::ShutDown, PATCH_JUMP);

1
src/modelinfo/ModelInfo.h
View File

@ -46,4 +46,5 @@ public:
static bool IsBikeModel(int32 id); static bool IsBikeModel(int32 id);
static void RemoveColModelsFromOtherLevels(eLevelName level); static void RemoveColModelsFromOtherLevels(eLevelName level);
static CStore<CInstance, MLOINSTANCESIZE>* CModelInfo::GetMloInstanceStore(); static CStore<CInstance, MLOINSTANCESIZE>* CModelInfo::GetMloInstanceStore();
static void ConstructMloClumps();
}; };