summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-02-24 10:10:59 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-02-24 10:10:59 +0100
commit6260d51d441eb9307d06f3fd70ee308b7b4d8f95 (patch)
tree83463dd048b9de1410ddb5f65c6bb5302650c07e /src/control/Script.cpp
parentmore stuff (diff)
parentscript fixes (diff)
downloadre3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.tar
re3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.tar.gz
re3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.tar.bz2
re3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.tar.lz
re3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.tar.xz
re3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.tar.zst
re3-6260d51d441eb9307d06f3fd70ee308b7b4d8f95.zip
Diffstat (limited to '')
-rw-r--r--src/control/Script.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 8b765c8c..3e4c7e8f 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -8496,7 +8496,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
CTimer::Stop();
CGame::currLevel = (eLevelName)ScriptParams[0];
CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
- CStreaming::RemoveIslandsNotUsed(CGame::currLevel);
+ CStreaming::RemoveUnusedBuildings(CGame::currLevel);
CCollision::SortOutCollisionAfterLoad();
CStreaming::RequestIslands(CGame::currLevel);
CStreaming::LoadAllRequestedModels(true);
@@ -8965,7 +8965,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
}
case COMMAND_SET_MUSIC_DOES_FADE:
CollectParameters(&m_nIp, 1);
- TheCamera.m_bMusicFading = (ScriptParams[0] == 0);
+ TheCamera.m_bIgnoreFadingStuffForMusic = (ScriptParams[0] == 0);
return 0;
case COMMAND_SET_INTRO_IS_PLAYING:
CollectParameters(&m_nIp, 1);
@@ -9114,7 +9114,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
DMAudio.Service();
CPopulation::DealWithZoneChange(CCollision::ms_collisionInMemory, CGame::currLevel, false);
CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
- CStreaming::RemoveIslandsNotUsed(CGame::currLevel);
+ CStreaming::RemoveUnusedBuildings(CGame::currLevel);
CCollision::SortOutCollisionAfterLoad();
CStreaming::RequestIslands(CGame::currLevel);
CStreaming::RequestBigBuildings(CGame::currLevel);