diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
| commit | 9960c411933f9a804eb5f6840d75ad00fd255252 (patch) | |
| tree | 19886c3263958d5c77664518270d252ad5554602 /src/core/Collision.cpp | |
| parent | Merge pull request #512 from Nick007J/master (diff) | |
| download | re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.gz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.bz2 re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.lz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.xz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.zst re3-9960c411933f9a804eb5f6840d75ad00fd255252.zip | |
Diffstat (limited to 'src/core/Collision.cpp')
| -rw-r--r-- | src/core/Collision.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index f20fee6d..0cdacfdb 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -20,10 +20,6 @@ #include "SurfaceTable.h" #include "Lines.h" #include "Collision.h" -#ifdef MIAMI -#include "Camera.h" -#include "ColStore.h" -#endif enum Direction { @@ -38,32 +34,22 @@ enum Direction eLevelName CCollision::ms_collisionInMemory; CLinkList<CColModel*> CCollision::ms_colModelCache; -//--MIAMI: done void CCollision::Init(void) { ms_colModelCache.Init(NUMCOLCACHELINKS); ms_collisionInMemory = LEVEL_NONE; -#ifdef MIAMI - CColStore::Initialise(); -#endif } -//--MIAMI: done void CCollision::Shutdown(void) { ms_colModelCache.Shutdown(); -#ifdef MIAMI - CColStore::Shutdown(); -#endif } -//--MIAMI: done void CCollision::Update(void) { -#ifndef MIAMI CVector playerCoors; playerCoors = FindPlayerCoors(); eLevelName level = CTheZones::m_CurrLevel; @@ -97,10 +83,8 @@ CCollision::Update(void) if(ms_collisionInMemory != CGame::currLevel) LoadCollisionWhenINeedIt(forceLevelChange); CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel); -#endif } -//--MIAMI: unused eLevelName GetCollisionInSectorList(CPtrList &list) { @@ -117,7 +101,6 @@ GetCollisionInSectorList(CPtrList &list) return LEVEL_NONE; } -//--MIAMI: unused // Get a level this sector is in based on collision models eLevelName GetCollisionInSector(CSector §) @@ -138,11 +121,9 @@ GetCollisionInSector(CSector §) return (eLevelName)level; } -//--MIAMI: done void CCollision::LoadCollisionWhenINeedIt(bool forceChange) { -#ifndef MIAMI eLevelName level, l; bool multipleLevels; CVector playerCoors; @@ -229,14 +210,11 @@ CCollision::LoadCollisionWhenINeedIt(bool forceChange) CTimer::Update(); DMAudio.SetEffectsFadeVol(127); } -#endif } -//--MIAMI: done void CCollision::SortOutCollisionAfterLoad(void) { -#ifndef MIAMI if(ms_collisionInMemory == CGame::currLevel) return; @@ -248,10 +226,6 @@ CCollision::SortOutCollisionAfterLoad(void) } ms_collisionInMemory = CGame::currLevel; CGame::TidyUpMemory(true, false); -#else - CColStore::LoadCollision(TheCamera.GetPosition()); - CStreaming::LoadAllRequestedModels(false); -#endif } void @@ -2000,11 +1974,7 @@ CColModel::CColModel(void) vertices = nil; triangles = nil; trianglePlanes = nil; -#ifndef MIAMI level = CGame::currLevel; -#else - level = 0; // generic col slot -#endif ownsCollisionVolumes = true; } |