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/entities | |
| 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/entities')
| -rw-r--r-- | src/entities/Building.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Entity.cpp | 4 | ||||
| -rw-r--r-- | src/entities/Physical.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/entities/Building.cpp b/src/entities/Building.cpp index 3217e684..921055ce 100644 --- a/src/entities/Building.cpp +++ b/src/entities/Building.cpp @@ -17,7 +17,7 @@ CBuilding::ReplaceWithNewModel(int32 id) m_modelIndex = id; if(bIsBIGBuilding) - if(m_level == LEVEL_NONE || m_level == CGame::currLevel) + if(m_level == LEVEL_GENERIC || m_level == CGame::currLevel) CStreaming::RequestModel(id, STREAMFLAGS_DONT_REMOVE); } diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 394b8162..04d6d328 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -359,8 +359,8 @@ CEntity::SetupBigBuilding(void) if(mi->m_lodDistances[0] <= 2000.0f) bStreamBIGBuilding = true; if(mi->m_lodDistances[0] > 2500.0f || mi->m_ignoreDrawDist) - m_level = LEVEL_NONE; - else if(m_level == LEVEL_NONE) + m_level = LEVEL_GENERIC; + else if(m_level == LEVEL_GENERIC) printf("%s isn't in a level\n", mi->GetName()); } diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 12345cc9..5fe29a79 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -75,7 +75,7 @@ CPhysical::CPhysical(void) #ifdef FIX_BUGS m_nSurfaceTouched = SURFACE_DEFAULT; #endif - m_nZoneLevel = LEVEL_NONE; + m_nZoneLevel = LEVEL_GENERIC; bIsFrozen = false; bDontLoadCollision = false; |