summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-07-09 18:18:42 +0200
committerSergeanur <s.anureev@yandex.ua>2020-07-09 18:18:42 +0200
commitcf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c (patch)
treef8a4337f1394c0c55b1be4e8ee62e49e713ba1c7 /src/control
parentRemove console and fix sth (diff)
downloadre3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.tar
re3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.tar.gz
re3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.tar.bz2
re3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.tar.lz
re3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.tar.xz
re3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.tar.zst
re3-cf69f22a0ce5b808a4d945a5cef1d9d4c51c0b5c.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 4de45e0d..3309dbd2 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -10027,11 +10027,15 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
CollectParameters(&m_nIp, 1);
CTimer::Stop();
CGame::currLevel = (eLevelName)ScriptParams[0];
+#ifndef NO_ISLAND_LOADING
CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
CStreaming::RemoveUnusedBuildings(CGame::currLevel);
+#endif
CCollision::SortOutCollisionAfterLoad();
+#ifndef NO_ISLAND_LOADING
CStreaming::RequestIslands(CGame::currLevel);
CStreaming::LoadAllRequestedModels(true);
+#endif
CTimer::Update();
return 0;
}
@@ -10647,18 +10651,24 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
CTimer::Stop();
CGame::currLevel = (eLevelName)ScriptParams[0];
if (CGame::currLevel != CCollision::ms_collisionInMemory) {
+#ifndef NO_ISLAND_LOADING
DMAudio.SetEffectsFadeVol(0);
CPad::StopPadsShaking();
CCollision::LoadCollisionScreen(CGame::currLevel);
DMAudio.Service();
+#endif
CPopulation::DealWithZoneChange(CCollision::ms_collisionInMemory, CGame::currLevel, false);
+#ifndef NO_ISLAND_LOADING
CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
CStreaming::RemoveUnusedBuildings(CGame::currLevel);
+#endif
CCollision::SortOutCollisionAfterLoad();
+#ifndef NO_ISLAND_LOADING
CStreaming::RequestIslands(CGame::currLevel);
CStreaming::RequestBigBuildings(CGame::currLevel);
CStreaming::LoadAllRequestedModels(true);
DMAudio.SetEffectsFadeVol(127);
+#endif
}
CTimer::Update();
return 0;