summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-02-23 16:32:28 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-02-23 16:34:53 +0100
commitcbf396e6e94109ada4e2ec020cb50163ac05dc41 (patch)
treef0c77e0b8500a3eaa746f60bfd79184569ffa6e4 /src/control
parentMerge pull request #333 from Nick007J/master (diff)
downloadre3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.tar
re3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.tar.gz
re3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.tar.bz2
re3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.tar.lz
re3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.tar.xz
re3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.tar.zst
re3-cbf396e6e94109ada4e2ec020cb50163ac05dc41.zip
Diffstat (limited to 'src/control')
-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 f6db26ec..3d8807d8 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -8544,7 +8544,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);
@@ -9013,7 +9013,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);
@@ -9162,7 +9162,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);