diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-08 10:00:24 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-08 10:00:24 +0100 |
| commit | 016ff5b4aa98ed24938284bfbf6db9373981a5de (patch) | |
| tree | 8ea809158b4ade6e2d6ecd70453e6a9766b25cd0 /src/core/World.cpp | |
| parent | pool stuff fix (diff) | |
| parent | Pool fixes from master (diff) | |
| download | re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.tar re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.tar.gz re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.tar.bz2 re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.tar.lz re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.tar.xz re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.tar.zst re3-016ff5b4aa98ed24938284bfbf6db9373981a5de.zip | |
Diffstat (limited to 'src/core/World.cpp')
| -rw-r--r-- | src/core/World.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 62f58f7f..dc04738a 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -35,7 +35,7 @@ CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS]; -CPtrList CWorld::ms_bigBuildingsList[4]; +CPtrList CWorld::ms_bigBuildingsList[NUM_LEVELS]; CPtrList CWorld::ms_listMovingEntityPtrs; CSector CWorld::ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X]; uint16 CWorld::ms_nCurrentScanCode; @@ -1788,13 +1788,13 @@ CWorld::ShutDown(void) pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush(); #endif } - for(int32 i = 0; i < 4; i++) { - for(CPtrNode *pNode = GetBigBuildingList((eLevelName)i).first; pNode; pNode = pNode->next) { + for(int32 i = 0; i < NUM_LEVELS; i++) { + for(CPtrNode *pNode = ms_bigBuildingsList[i].first; pNode; pNode = pNode->next) { CEntity *pEntity = (CEntity *)pNode->item; // Maybe remove from world here? delete pEntity; } - GetBigBuildingList((eLevelName)i).Flush(); + ms_bigBuildingsList[i].Flush(); } for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) { CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y); |