diff options
author | aap <aap@papnet.eu> | 2021-01-24 17:14:16 +0100 |
---|---|---|
committer | aap <aap@papnet.eu> | 2021-01-24 17:14:16 +0100 |
commit | a202e6734991060d921e22aff0358862530e47a4 (patch) | |
tree | 2fe352f839dcdc64c6d00d79d9ece2fa8185ef60 /src/core | |
parent | CClumpModelInfo (diff) | |
download | re3-a202e6734991060d921e22aff0358862530e47a4.tar re3-a202e6734991060d921e22aff0358862530e47a4.tar.gz re3-a202e6734991060d921e22aff0358862530e47a4.tar.bz2 re3-a202e6734991060d921e22aff0358862530e47a4.tar.lz re3-a202e6734991060d921e22aff0358862530e47a4.tar.xz re3-a202e6734991060d921e22aff0358862530e47a4.tar.zst re3-a202e6734991060d921e22aff0358862530e47a4.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/AnimViewer.cpp | 2 | ||||
-rw-r--r-- | src/core/FileLoader.cpp | 6 | ||||
-rw-r--r-- | src/core/Game.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index 854ec7d4..1a7facc1 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -81,7 +81,7 @@ CAnimViewer::Initialise(void) { CCollision::Init(); CWorld::Initialise(); mod_HandlingManager.Initialise(); - CTempColModels::Initialise(); + gpTempColModels->Initialise(); CAnimManager::Initialise(); CModelInfo::Initialise(); CParticle::Initialise(); diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 10f504c9..2818007b 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -833,7 +833,7 @@ CFileLoader::LoadWeaponObject(const char *line) mi->m_lodDistances[0] = dist; mi->SetTexDictionary(txd); mi->SetAnimFile(animFile); - mi->SetColModel(&CTempColModels::ms_colModelWeapon); + mi->SetColModel(&gpTempColModels->ms_colModelWeapon); MatchModelString(model, id); return id; } @@ -849,7 +849,7 @@ CFileLoader::LoadClumpObject(const char *line) mi = CModelInfo::AddClumpModel(id); mi->SetModelName(model); mi->SetTexDictionary(txd); - mi->SetColModel(&CTempColModels::ms_colModelBBox); + mi->SetColModel(&gpTempColModels->ms_colModelBBox); } } @@ -956,7 +956,7 @@ CFileLoader::LoadPedObject(const char *line) mi->SetModelName(model); mi->SetTexDictionary(txd); mi->SetAnimFile(animFile); - mi->SetColModel(&CTempColModels::ms_colModelPed1); + mi->SetColModel(&gpTempColModels->ms_colModelPed1); mi->m_pedType = CPedType::FindPedType(pedType); mi->m_pedStatType = CPedStats::GetPedStatType(pedStats); for(animGroupId = 0; animGroupId < NUM_ANIM_ASSOC_GROUPS; animGroupId++) diff --git a/src/core/Game.cpp b/src/core/Game.cpp index e0becc43..67ad2890 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -316,7 +316,7 @@ bool CGame::InitialiseOnceAfterRW(void) { TheText.Load(); CTimer::Initialise(); - CTempColModels::Initialise(); + gpTempColModels->Initialise(); mod_HandlingManager.Initialise(); CSurfaceTable::Initialise("DATA\\SURFACE.DAT"); CPedStats::Initialise(); |