diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-07-13 17:10:17 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-07-13 17:10:17 +0200 |
| commit | d0f5464200be032ee464218cfe415f3ce0b119a7 (patch) | |
| tree | dd6f068286bb29c72192689bf741c43fcb505ae1 /src/core/Collision.cpp | |
| parent | Merge pull request #654 from erorcun/miami (diff) | |
| parent | Rename LEVEL_NONE to LEVEL_GENERIC (diff) | |
| download | re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.gz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.bz2 re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.lz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.xz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.zst re3-d0f5464200be032ee464218cfe415f3ce0b119a7.zip | |
Diffstat (limited to 'src/core/Collision.cpp')
| -rw-r--r-- | src/core/Collision.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index 76019c2f..fd172cb8 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -41,7 +41,7 @@ void CCollision::Init(void) { ms_colModelCache.Init(NUMCOLCACHELINKS); - ms_collisionInMemory = LEVEL_NONE; + ms_collisionInMemory = LEVEL_GENERIC; CColStore::Initialise(); } @@ -70,10 +70,10 @@ GetCollisionInSectorList(CPtrList &list) for(node = list.first; node; node = node->next){ e = (CEntity*)node->item; level = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel()->level; - if(level != LEVEL_NONE) + if(level != LEVEL_GENERIC) return (eLevelName)level; } - return LEVEL_NONE; + return LEVEL_GENERIC; } //--MIAMI: unused @@ -84,15 +84,15 @@ GetCollisionInSector(CSector §) int level; level = GetCollisionInSectorList(sect.m_lists[ENTITYLIST_BUILDINGS]); - if(level == LEVEL_NONE) + if(level == LEVEL_GENERIC) level = GetCollisionInSectorList(sect.m_lists[ENTITYLIST_BUILDINGS_OVERLAP]); - if(level == LEVEL_NONE) + if(level == LEVEL_GENERIC) level = GetCollisionInSectorList(sect.m_lists[ENTITYLIST_OBJECTS]); - if(level == LEVEL_NONE) + if(level == LEVEL_GENERIC) level = GetCollisionInSectorList(sect.m_lists[ENTITYLIST_OBJECTS_OVERLAP]); - if(level == LEVEL_NONE) + if(level == LEVEL_GENERIC) level = GetCollisionInSectorList(sect.m_lists[ENTITYLIST_DUMMIES]); - if(level == LEVEL_NONE) + if(level == LEVEL_GENERIC) level = GetCollisionInSectorList(sect.m_lists[ENTITYLIST_DUMMIES_OVERLAP]); return (eLevelName)level; } |