diff options
author | aap <aap@papnet.eu> | 2020-12-01 11:25:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 11:25:02 +0100 |
commit | 56c471d02e1c704202f809de7f3d179c98ae121f (patch) | |
tree | a1886f8b54f498c02c9ffecb9f1541f65ecedfae /src/core/World.cpp | |
parent | d6fab1bc53627d55391d10a557a9e0cbcd11ac6d (diff) | |
parent | a3b83a5d2fe7b614b8b3693305535112f68912bb (diff) |
Merge pull request #854 from Nick007J/master
small garages + templates revision
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r-- | src/core/World.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 62d8d002..844a4fb7 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -1738,10 +1738,12 @@ CWorld::ShutDown(void) CWorld::Remove(pEntity); delete pEntity; } +#ifndef FIX_BUGS pSector->m_lists[ENTITYLIST_BUILDINGS].Flush(); pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].Flush(); pSector->m_lists[ENTITYLIST_DUMMIES].Flush(); 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) { @@ -1753,6 +1755,12 @@ CWorld::ShutDown(void) } for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) { CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y); +#ifdef FIX_BUGS + pSector->m_lists[ENTITYLIST_BUILDINGS].Flush(); + pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].Flush(); + pSector->m_lists[ENTITYLIST_DUMMIES].Flush(); + pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush(); +#endif if(pSector->m_lists[ENTITYLIST_BUILDINGS].first) { sprintf(gString, "Building list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y); pSector->m_lists[ENTITYLIST_BUILDINGS].Flush(); |