Merge branch 'master' of github.com:gtamodding/re3

This commit is contained in:
aap 2020-08-18 11:09:50 +02:00
commit e3405f4be4
29 changed files with 860 additions and 660 deletions

View file

@ -19,6 +19,7 @@
#include "Shadows.h"
#include "PointLights.h"
#include "Renderer.h"
#include "Frontend.h"
#include "custompipes.h"
bool gbShowPedRoadGroups;
@ -720,15 +721,18 @@ CRenderer::ScanWorld(void)
ScanSectorPoly(poly, 3, ScanSectorList);
}
#ifdef NO_ISLAND_LOADING
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL));
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_COMMERCIAL));
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_SUBURBAN));
#else
if (CMenuManager::m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_HIGH) {
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL));
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_COMMERCIAL));
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_SUBURBAN));
} else
#endif
{
#ifdef FIX_BUGS
if (CCollision::ms_collisionInMemory != LEVEL_GENERIC)
#endif
ScanBigBuildingList(CWorld::GetBigBuildingList(CCollision::ms_collisionInMemory));
#endif
ScanBigBuildingList(CWorld::GetBigBuildingList(CCollision::ms_collisionInMemory));
}
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_GENERIC));
}
}