[Scummvm-git-logs] scummvm master -> f3113cf45d106d9c5b5b64eff8c10be04cb52b38
antoniou79
a.antoniou79 at gmail.com
Mon Jun 14 14:22:46 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b8eb0d0386 BLADERUNNER: Play the ambient audience clapping once
45d9ee85d2 BLADERUNNER: Allow audio stream to start at requested second
7a2a53b9ff BLADERUNNER: RESTORED CONTENT: Start some music at random second
f3113cf45d BLADERUNNER: More precise naming for time delay vars and parameters
Commit: b8eb0d03862b11c62f01fbd75c248965e09e1dfe
https://github.com/scummvm/scummvm/commit/b8eb0d03862b11c62f01fbd75c248965e09e1dfe
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-14T16:27:18+03:00
Commit Message:
BLADERUNNER: Play the ambient audience clapping once
Original played it at every frame for 15 frames and it sounded robotic and bugged
Changed paths:
engines/bladerunner/script/scene/nr08.cpp
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index 07fc792d54..9f94915b3e 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -150,7 +150,15 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
) {
Set_Fade_Density((frame - 76) / 14.0f);
Music_Stop(3);
+#if BLADERUNNER_ORIGINAL_BUGS
Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
+#else
+ // Play the ambient audience clapping once.
+ // Otherwise it sounds robotic and it's unnecessary to play at every frame
+ if (frame == 76) {
+ Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
+ }
+#endif
} else if (frame >= 91
&& frame < 120
) {
Commit: 45d9ee85d2c7ba684d0ddd434dffb60c69def18f
https://github.com/scummvm/scummvm/commit/45d9ee85d2c7ba684d0ddd434dffb60c69def18f
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-14T16:27:18+03:00
Commit Message:
BLADERUNNER: Allow audio stream to start at requested second
This will be used in Restored Content mode
Changed paths:
engines/bladerunner/adpcm_decoder.cpp
engines/bladerunner/aud_stream.cpp
engines/bladerunner/aud_stream.h
engines/bladerunner/game_constants.h
engines/bladerunner/music.cpp
engines/bladerunner/music.h
diff --git a/engines/bladerunner/adpcm_decoder.cpp b/engines/bladerunner/adpcm_decoder.cpp
index 33c4282e1c..4bb8f84682 100644
--- a/engines/bladerunner/adpcm_decoder.cpp
+++ b/engines/bladerunner/adpcm_decoder.cpp
@@ -150,15 +150,17 @@ void ADPCMWestwoodDecoder::decode(uint8 *in, size_t size, int16 *out, bool force
predictor = CLIP<int32>(predictor, -32768, 32767);
- if (forceLittleEndianOut) {
- // Bugfix:
- // enforce "little-endian" type of output for VQA audio stream
- // This is needed for Big Endian platforms to behave correctly in raw audio streams in VQA videos
- // because in VQADecoder::VQAAudioTrack::decodeAudioFrame() a raw stream is created for the audio
- // with the explicit flag: FLAG_LITTLE_ENDIAN
- WRITE_LE_INT16(out++, (int16)predictor);
- } else {
- *out++ = (int16)predictor;
+ if (out) {
+ if (forceLittleEndianOut) {
+ // Bugfix:
+ // enforce "little-endian" type of output for VQA audio stream
+ // This is needed for Big Endian platforms to behave correctly in raw audio streams in VQA videos
+ // because in VQADecoder::VQAAudioTrack::decodeAudioFrame() a raw stream is created for the audio
+ // with the explicit flag: FLAG_LITTLE_ENDIAN
+ WRITE_LE_INT16(out++, (int16)predictor);
+ } else {
+ *out++ = (int16)predictor;
+ }
}
stepIndex = imaIndexTable[code] + stepIndex;
stepIndex = CLIP<int16>(stepIndex, 0, 88);
diff --git a/engines/bladerunner/aud_stream.cpp b/engines/bladerunner/aud_stream.cpp
index 1298981ef7..7dff329e99 100644
--- a/engines/bladerunner/aud_stream.cpp
+++ b/engines/bladerunner/aud_stream.cpp
@@ -104,7 +104,11 @@ int AudStream::readBuffer(int16 *buffer, const int numSamples) {
assert(_end - _p >= _deafBlockRemain);
int bytesConsumed = MIN<int>(_deafBlockRemain, (numSamples - samplesRead) / 2);
- _decoder.decode(_p, bytesConsumed, buffer + samplesRead, false);
+ if (buffer) {
+ _decoder.decode(_p, bytesConsumed, buffer + samplesRead, false);
+ } else {
+ _decoder.decode(_p, bytesConsumed, nullptr, false);
+ }
_p += bytesConsumed;
_deafBlockRemain -= bytesConsumed;
@@ -112,14 +116,40 @@ int AudStream::readBuffer(int16 *buffer, const int numSamples) {
}
} else {
samplesRead = MIN(numSamples, (int)(_end - _p) / 2);
- for (int i = 0; i < samplesRead; ++i, _p += 2) {
- buffer[i] = READ_LE_UINT16(_p);
+ if (buffer) {
+ for (int i = 0; i < samplesRead; ++i, _p += 2) {
+ buffer[i] = READ_LE_UINT16(_p);
+ }
}
}
return samplesRead;
}
+int AudStream::getBytesPerSecond() const {
+ int bytesPerSecond = _overrideFrequency > 0 ? _overrideFrequency : _frequency;
+ if (_flags & 1) { // 16 bit
+ bytesPerSecond *= 2;
+ }
+ if (_flags & 2) { // stereo
+ bytesPerSecond *= 2;
+ }
+ return bytesPerSecond;
+}
+
+bool AudStream::startAtSecond(uint32 startSecond) {
+ uint32 audStreamLengthMillis = getLength();
+ if (startSecond == 0 || startSecond * 1000 > audStreamLengthMillis || audStreamLengthMillis == 0) {
+ return false;
+ }
+ if (rewind()) {
+ int samplesPerSecond = _overrideFrequency > 0 ? _overrideFrequency : _frequency;
+ readBuffer(nullptr, startSecond * samplesPerSecond);
+ return true;
+ }
+ return false;
+}
+
bool AudStream::rewind() {
_p = _data + 12;
_decoder.setParameters(0, 0);
@@ -130,16 +160,12 @@ bool AudStream::rewind() {
* Returns audio length in milliseconds
*/
uint32 AudStream::getLength() const {
- int bytesPerSecond = _overrideFrequency > 0 ? _overrideFrequency : _frequency;
- if (_flags & 1) { // 16 bit
- bytesPerSecond *= 2;
- }
- if (_flags & 2) { // stereo
- bytesPerSecond *= 2;
- }
-
// since everything is 44100, we easily get overflows with ints
// thus we must use doubles
+ int bytesPerSecond = getBytesPerSecond();
+ if (bytesPerSecond <= 0) {
+ return 0u;
+ }
double res = (double)_sizeDecompressed * 1000.0 / (double)bytesPerSecond;
return (uint32)res;
}
diff --git a/engines/bladerunner/aud_stream.h b/engines/bladerunner/aud_stream.h
index 9deb8201dc..fe2a5155b7 100644
--- a/engines/bladerunner/aud_stream.h
+++ b/engines/bladerunner/aud_stream.h
@@ -62,6 +62,8 @@ public:
bool endOfData() const override { return _p == _end; }
bool rewind() override;
uint32 getLength() const;
+ bool startAtSecond(uint32 startSecond);
+ int getBytesPerSecond() const;
};
} // End of namespace BladeRunner
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 3daa50243d..71386a9173 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -4170,6 +4170,14 @@ enum GameDifficultyLevel {
kGameDifficultyMedium = 1,
kGameDifficultyHard = 2
};
+
+enum MusicTrackLoop {
+ kMusicLoopPlayOnce = 0, // do not loop
+ kMusicLoopRepeat = 1, // loop track
+ kMusicLoopRepeatRandomStart = 2, // (Restored Content) start from random point - do not loop track
+ kMusicLoopPlayOnceRandomStart = 3 // (Restored Content) start from random point - loop track
+};
+
} // End of namespace BladeRunner
#endif
diff --git a/engines/bladerunner/music.cpp b/engines/bladerunner/music.cpp
index e248618055..ca35f623d6 100644
--- a/engines/bladerunner/music.cpp
+++ b/engines/bladerunner/music.cpp
@@ -125,7 +125,23 @@ bool Music::play(const Common::String &trackName, int volume, int pan, int32 tim
_stream = new AudStream(_data);
_isNextPresent = false;
- _channel = _vm->_audioMixer->playMusic(_stream, volumeStart, mixerChannelEnded, this, _stream->getLength());
+ uint32 trackLengthInMillis = _stream->getLength();
+
+ uint32 secondToStart = 0;
+ // loop > 1 can only happen in restored content, so no need to check for _vm->_cutContent explicitly here
+ if (loop > 1 && trackLengthInMillis > 0) {
+ // start at some point within the first half of the track
+ if (timePlaySeconds > 0 && trackLengthInMillis/1000 > (uint32)timePlaySeconds) {
+ secondToStart = _vm->_rnd.getRandomNumberRng(0, MIN(trackLengthInMillis/2000, (trackLengthInMillis/1000 - (uint32)timePlaySeconds)));
+ } else if (timeFadeOutSeconds >= 0 && trackLengthInMillis/1000 > (uint32)timeFadeOutSeconds) {
+ secondToStart = _vm->_rnd.getRandomNumberRng(0, MIN(trackLengthInMillis/2000, (trackLengthInMillis/1000 - (uint32)timeFadeOutSeconds)));
+ }
+ }
+ if (secondToStart > 0) {
+ _stream->startAtSecond(secondToStart);
+ }
+
+ _channel = _vm->_audioMixer->playMusic(_stream, volumeStart, mixerChannelEnded, this, trackLengthInMillis);
if (_channel < 0) {
delete _stream;
_stream = nullptr;
@@ -138,6 +154,7 @@ bool Music::play(const Common::String &trackName, int volume, int pan, int32 tim
adjustVolume(volumeAdjusted, timeFadeInSeconds);
}
_current.name = trackName;
+
if (timePlaySeconds > 0) {
// Removes any previous fadeout timer and installs a new one.
// Uses the timeFadeOutSeconds value (see Music::fadeOut())
@@ -151,10 +168,10 @@ bool Music::play(const Common::String &trackName, int volume, int pan, int32 tim
} else if (timeFadeOutSeconds > 0) {
#if BLADERUNNER_ORIGINAL_BUGS
_vm->getTimerManager()->removeTimerProc(timerCallbackFadeOut);
- _vm->getTimerManager()->installTimerProc(timerCallbackFadeOut, (_stream->getLength() - timeFadeOutSeconds * 1000) * 1000, this, "BladeRunnerMusicFadeoutTimer");
+ _vm->getTimerManager()->installTimerProc(timerCallbackFadeOut, (trackLengthInMillis - timeFadeOutSeconds * 1000) * 1000, this, "BladeRunnerMusicFadeoutTimer");
#else
_vm->_audioMixer->stopAppTimerProc(kAudioMixerAppTimerMusicFadeOut);
- _vm->_audioMixer->startAppTimerProc(kAudioMixerAppTimerMusicFadeOut, (_stream->getLength() - timeFadeOutSeconds * 1000u));
+ _vm->_audioMixer->startAppTimerProc(kAudioMixerAppTimerMusicFadeOut, (trackLengthInMillis - timeFadeOutSeconds * 1000u));
#endif //BLADERUNNER_ORIGINAL_BUGS
}
_isPlaying = true;
@@ -163,6 +180,11 @@ bool Music::play(const Common::String &trackName, int volume, int pan, int32 tim
_current.timeFadeInSeconds = timeFadeInSeconds;
_current.timePlaySeconds = timePlaySeconds;
_current.loop = loop;
+ // loop == kMusicLoopPlayOnceRandomStart can only happen in restored content, so no need to check for _vm->_cutContent explicitly here
+ if (_current.loop == kMusicLoopRepeatRandomStart) {
+ // loop value to store (and use in next loop) should be kMusicLoopRepeat
+ _current.loop = kMusicLoopRepeat;
+ }
_current.timeFadeOutSeconds = timeFadeOutSeconds;
return true;
}
@@ -213,7 +235,7 @@ int Music::getVolume() {
void Music::playSample() {
if (!isPlaying()) {
- play(_vm->_gameInfo->getSfxTrack(kSfxMUSVOL8), 100, 0, 2, -1, 0, 3);
+ play(_vm->_gameInfo->getSfxTrack(kSfxMUSVOL8), 100, 0, 2, -1, kMusicLoopPlayOnce, 3);
}
}
diff --git a/engines/bladerunner/music.h b/engines/bladerunner/music.h
index 621653bcf7..c8b9754bf4 100644
--- a/engines/bladerunner/music.h
+++ b/engines/bladerunner/music.h
@@ -40,7 +40,8 @@ class Music {
int pan; // A value between -100 and 100 (right?) (0 is center) - It is the set pan/balance for the track regardless of any ongoing adjustments
int32 timeFadeInSeconds; // how long will it take for the track to reach target volume (in seconds)
int32 timePlaySeconds; // how long the track will play before starting fading out (in seconds) - uses timeFadeOutSeconds for fadeout
- int loop; // 0: do not loop, 1: loop track
+ // -1: Special value for playing the whole track
+ int loop; // values from enum MusicTrackLoop (see game_constants.h)
int32 timeFadeOutSeconds; // how long the fade out will be for the track at its end (in seconds)
};
Commit: 7a2a53b9ff6d00e1783de471a856b29a77944a5c
https://github.com/scummvm/scummvm/commit/7a2a53b9ff6d00e1783de471a856b29a77944a5c
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-14T16:27:19+03:00
Commit Message:
BLADERUNNER: RESTORED CONTENT: Start some music at random second
Changed paths:
engines/bladerunner/debugger.cpp
engines/bladerunner/script/ai/gordo.cpp
engines/bladerunner/script/scene/ar01.cpp
engines/bladerunner/script/scene/ar02.cpp
engines/bladerunner/script/scene/bb11.cpp
engines/bladerunner/script/scene/ct01.cpp
engines/bladerunner/script/scene/ct02.cpp
engines/bladerunner/script/scene/dr05.cpp
engines/bladerunner/script/scene/hc01.cpp
engines/bladerunner/script/scene/hc02.cpp
engines/bladerunner/script/scene/hc04.cpp
engines/bladerunner/script/scene/hf04.cpp
engines/bladerunner/script/scene/hf05.cpp
engines/bladerunner/script/scene/hf06.cpp
engines/bladerunner/script/scene/kp03.cpp
engines/bladerunner/script/scene/kp07.cpp
engines/bladerunner/script/scene/ma02.cpp
engines/bladerunner/script/scene/ma04.cpp
engines/bladerunner/script/scene/ma05.cpp
engines/bladerunner/script/scene/nr02.cpp
engines/bladerunner/script/scene/nr03.cpp
engines/bladerunner/script/scene/nr04.cpp
engines/bladerunner/script/scene/nr05.cpp
engines/bladerunner/script/scene/nr06.cpp
engines/bladerunner/script/scene/nr08.cpp
engines/bladerunner/script/scene/nr09.cpp
engines/bladerunner/script/scene/nr11.cpp
engines/bladerunner/script/scene/tb02.cpp
engines/bladerunner/script/scene/ug01.cpp
engines/bladerunner/ui/end_credits.cpp
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 953e90461e..d65188eb1f 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -640,7 +640,7 @@ bool Debugger::cmdMusic(int argc, const char** argv) {
}
return true;
} else if (trackArgStr == "stop") {
- _vm->_music->stop(0);
+ _vm->_music->stop(0u);
//_vm->_ambientSounds->removeLoopingSound(kSfxMUSBLEED, 0);
} else {
int musicId = atoi(argv[1]);
@@ -651,8 +651,8 @@ bool Debugger::cmdMusic(int argc, const char** argv) {
debugPrintf("Invalid music track id specified.\nPlease choose an integer between 0 and %d.\n", (int)_vm->_gameInfo->getMusicTrackCount() - 1);
return true;
} else {
- _vm->_music->stop(0);
- _vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), 100, 0, 0, -1, 0, 0);
+ _vm->_music->stop(0u);
+ _vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), 100, 0, 0, -1, kMusicLoopPlayOnce, 0);
//debugPrintf("Now playing track %2d - \"%s\" (%s)\n", musicId, kMusicTracksArr[musicId], _vm->_gameInfo->getMusicTrack(musicId).c_str());
debugPrintf("Now playing track %2d - \"%s\"\n", musicId, kMusicTracksArr[musicId]);
}
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index 42971ef640..e7dff00b52 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -218,7 +218,7 @@ void AIScriptGordo::CompletedMovementTrack() {
}
if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR01RunAway) {
- Music_Stop(2);
+ Music_Stop(2u);
Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR01RanAway);
}
// return false;
@@ -323,7 +323,7 @@ void AIScriptGordo::Retired(int byActorId) {
#endif // BLADERUNNER_ORIGINAL_BUGS
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
@@ -572,7 +572,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Face_Actor(kActorGordo, kActorMcCoy, true);
Actor_Says(kActorGordo, 720, 16);
Actor_Says(kActorGordo, 730, 18);
- Music_Stop(1);
+ Music_Stop(1u);
Actor_Face_Actor(kActorMcCoy, kActorGordo, true);
Actor_Says(kActorGordo, 740, 17);
Sound_Play(kSfxRIMSHOT1, 50, 0, 0, 50);
@@ -626,7 +626,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Flush(kActorGordo);
AI_Movement_Track_Append_Run(kActorGordo, 366, 0);
AI_Movement_Track_Repeat(kActorGordo);
- Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
break;
case kGoalGordoNR02RunAway2:
@@ -719,7 +719,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
break;
case kGoalGordoNR01Die:
- Music_Stop(2);
+ Music_Stop(2u);
AI_Countdown_Timer_Reset(kActorGordo, kActorTimerAIScriptCustomTask0);
ADQ_Flush();
AI_Movement_Track_Flush(kActorGordo);
@@ -1786,7 +1786,7 @@ void AIScriptGordo::talkToMcCoyAtNR02() {
}
void AIScriptGordo::dialogue2() {
- Music_Stop(5);
+ Music_Stop(5u);
Dialogue_Menu_Clear_List();
DM_Add_To_List_Never_Repeat_Once_Selected(820, -1, 5, 7); // ARREST
DM_Add_To_List_Never_Repeat_Once_Selected(830, 7, 5, -1); // LET GO
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index bb872cc29a..647b252098 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -41,7 +41,12 @@ enum kAR01Exits {
};
void SceneScriptAR01::InitializeScene() {
- Music_Play(kMusicArabLoop, 25, 0, 2, -1, 1, 2);
+ if (_vm->_cutContent) {
+ Music_Play(kMusicArabLoop, 25, 0, 2, -1, kMusicLoopRepeatRandomStart, 2);
+ } else {
+ Music_Play(kMusicArabLoop, 25, 0, 2, -1, kMusicLoopRepeat, 2);
+ }
+
if (Game_Flag_Query(kFlagHC01toAR01)) {
Setup_Scene_Information(-477.0f, 0.0f, -149.0f, 333);
} else if (Game_Flag_Query(kFlagAR02toAR01)) {
@@ -74,10 +79,10 @@ void SceneScriptAR01::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxHCANM6, 3, 30, 11, 11, 50, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxHCANM7, 3, 30, 11, 11, 50, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxHCANM1, 3, 30, 11, 11, 50, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -454,9 +459,9 @@ void SceneScriptAR01::PlayerWalkedIn() {
void SceneScriptAR01::PlayerWalkedOut() {
Actor_Set_Invisible(kActorMcCoy, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (!Game_Flag_Query(kFlagMcCoyInHawkersCircle)) {
- Music_Stop(2);
+ Music_Stop(2u);
}
if (!Game_Flag_Query(kFlagAR01toHC01)
&& !Game_Flag_Query(kFlagAR01toAR02)
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index f401886067..d5cc93661f 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -25,7 +25,11 @@
namespace BladeRunner {
void SceneScriptAR02::InitializeScene() {
- Music_Play(kMusicArabLoop, 22, 0, 2, -1, 1, 2);
+ if (_vm->_cutContent) {
+ Music_Play(kMusicArabLoop, 22, 0, 2, -1, kMusicLoopRepeatRandomStart, 2);
+ } else {
+ Music_Play(kMusicArabLoop, 22, 0, 2, -1, kMusicLoopRepeat, 2);
+ }
if (Game_Flag_Query(kFlagRC03toAR02)) {
Setup_Scene_Information(-560.0f, 0.0f, -799.0f, 333);
} else {
@@ -53,10 +57,10 @@ void SceneScriptAR02::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxHCANM6, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxHCANM7, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxHCANM1, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -352,7 +356,7 @@ bool SceneScriptAR02::ClickedOnExit(int exitId) {
Game_Flag_Set(kFlagAR02toRC03);
Game_Flag_Reset(kFlagMcCoyInAnimoidRow);
Game_Flag_Set(kFlagMcCoyInRunciters);
- Music_Stop(3);
+ Music_Stop(3u);
Set_Enter(kSetRC03, kSceneRC03);
}
return true;
@@ -380,7 +384,7 @@ void SceneScriptAR02::PlayerWalkedIn() {
void SceneScriptAR02::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptAR02::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp
index 2085c2a7bf..38502a2865 100644
--- a/engines/bladerunner/script/scene/bb11.cpp
+++ b/engines/bladerunner/script/scene/bb11.cpp
@@ -91,7 +91,7 @@ bool SceneScriptBB11::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.39f, -10.27f, -68.52f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB11toBB10);
Set_Enter(kSetBB10, kSceneBB10);
}
@@ -138,14 +138,14 @@ void SceneScriptBB11::PlayerWalkedIn() {
) {
Actor_Set_Invisible(kActorMcCoy, true);
Actor_Set_Goal_Number(kActorSadik, kGoalSadikBB11ThrowMcCoy);
- Music_Play(kMusicBeating1, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicBeating1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
Player_Loses_Control();
}
}
void SceneScriptBB11::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptBB11::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp
index e58f270053..75aed9a70b 100644
--- a/engines/bladerunner/script/scene/ct01.cpp
+++ b/engines/bladerunner/script/scene/ct01.cpp
@@ -42,7 +42,11 @@ enum kCT01Exits {
};
void SceneScriptCT01::InitializeScene() {
- Music_Play(kMusicKyoto, 28, 0, 2, -1, 1, 0);
+ int loop = kMusicLoopRepeat;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopRepeatRandomStart;
+ }
+ Music_Play(kMusicKyoto, 28, 0, 2, -1, loop, 0);
Game_Flag_Reset(kFlagArrivedFromSpinner1);
if (Game_Flag_Query(kFlagCT02toCT01)) {
Game_Flag_Reset(kFlagCT02toCT01);
@@ -113,10 +117,10 @@ void SceneScriptCT01::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxDISH2, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxDISH3, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxDISH4, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 20, 40, 33, 50, -100, 100, -101, -101, 0, 0);
@@ -534,23 +538,23 @@ void SceneScriptCT01::PlayerWalkedIn() {
void SceneScriptCT01::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
if (Game_Flag_Query(kFlagCT01toCT12)) {
- Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, 1);
- Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, 1);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, 1u);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, 1u);
} else {
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
- Music_Stop(5);
+ Music_Stop(5u);
#if BLADERUNNER_ORIGINAL_BUGS
if (!Game_Flag_Query(kFlagMcCoyInChinaTown) && Global_Variable_Query(kVariableChapter) == 1) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeTowards3, true, -1);
}
#else
// Acts 2, 3 - should still use a spinner fly-through transition
// also removed the redundant Ambient_Sounds_Remove_All_Non_Looping_Sounds
if (!Game_Flag_Query(kFlagMcCoyInChinaTown)) {
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (!Game_Flag_Query(kFlagMcCoyInTyrellBuilding)) {
// don't play this outtake when going to Tyrell Building
Outtake_Play(kOuttakeTowards3, true, -1); // available in Acts 1, 2, 3
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index 4a22b35833..bd7e839f79 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -71,10 +71,10 @@ void SceneScriptCT02::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxDISH2, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxDISH3, 10, 30, 8, 8, 100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxDISH4, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
if (Game_Flag_Query(kFlagCT02PotTipped)) {
Scene_Loop_Set_Default(kCT02LoopMainPotTipped);
} else {
@@ -287,7 +287,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) {
if (exitId == kCT02ExitCT01) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -111.2f, -145.11f, 243.28f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT02toCT01walk);
Game_Flag_Set(kFlagCT02toCT01);
Set_Enter(kSetCT01_CT12, kSceneCT01);
@@ -303,7 +303,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) {
}
if (!v1) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT02toCT03);
Set_Enter(kSetCT03_CT04, kSceneCT03);
}
@@ -341,7 +341,7 @@ void SceneScriptCT02::SceneFrameAdvanced(int frame) {
Sound_Play(kSfxPOTSPL5, 60, -20, 40, 50);
}
if (frame == 61) {
- Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
}
if (frame == 81) {
Scene_Exit_Add_2D_Exit(kCT02ExitCT03, 332, 163, 404, 297, 0);
diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp
index d0953887d4..4d0940416b 100644
--- a/engines/bladerunner/script/scene/dr05.cpp
+++ b/engines/bladerunner/script/scene/dr05.cpp
@@ -122,7 +122,7 @@ bool SceneScriptDR05::ClickedOnItem(int itemId, bool a2) {
Item_Remove_From_World(kItemChain);
Game_Flag_Set(kFlagDR05ChainShot);
Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiFreed);
- Music_Play(kMusicMoraji, 71, 0, 0, -1, 0, 2);
+ Music_Play(kMusicMoraji, 71, 0, 0, -1, kMusicLoopPlayOnce, 2);
return true;
}
return false;
@@ -208,7 +208,7 @@ void SceneScriptDR05::PlayerWalkedIn() {
void SceneScriptDR05::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (Actor_Query_Goal_Number(kActorMoraji) == kGoalMorajiFreed
|| Actor_Query_Goal_Number(kActorMoraji) == kGoalMorajiGetUp
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 041bf0bf5f..b82ec95d76 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -25,7 +25,11 @@
namespace BladeRunner {
void SceneScriptHC01::InitializeScene() {
- Music_Play(kMusicArabLoop, 31, 0, 2, -1, 1, 2);
+ int loop = kMusicLoopRepeat;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopRepeatRandomStart;
+ }
+ Music_Play(kMusicArabLoop, 31, 0, 2, -1, loop, 2);
if (Game_Flag_Query(kFlagHC02toHC01)) {
Setup_Scene_Information( 64.0f, 0.14f, 83.0f, 266);
} else if (Game_Flag_Query(kFlagHC03toHC01)) {
@@ -166,7 +170,7 @@ bool SceneScriptHC01::ClickedOnItem(int itemId, bool a2) {
bool SceneScriptHC01::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 814.0f, 0.14f, 153.0f, 0, true, false, false)) {
- Music_Adjust(12, 0, 2);
+ Music_Adjust(12, 0, 2u);
Game_Flag_Set(kFlagHC01toAR01);
Set_Enter(kSetAR01_AR02, kSceneAR01);
Game_Flag_Reset(kFlagMcCoyInHawkersCircle);
@@ -263,7 +267,7 @@ void SceneScriptHC01::PlayerWalkedIn() {
void SceneScriptHC01::PlayerWalkedOut() {
Set_Fade_Density(0.0f);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptHC01::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp
index 41fd7c7d12..9610348b6f 100644
--- a/engines/bladerunner/script/scene/hc02.cpp
+++ b/engines/bladerunner/script/scene/hc02.cpp
@@ -25,7 +25,11 @@
namespace BladeRunner {
void SceneScriptHC02::InitializeScene() {
- Music_Play(kMusicOneTime, 45, -60, 1, -1, 1, 3);
+ int loop = kMusicLoopRepeat;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopRepeatRandomStart;
+ }
+ Music_Play(kMusicOneTime, 45, -60, 1, -1, loop, 3);
if (Game_Flag_Query(kFlagHC04toHC02)) {
Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 540);
} else {
@@ -179,7 +183,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 7.0f, 0.14f, 79.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHC02toHC01);
Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC01);
}
@@ -189,7 +193,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, 0.14f, -339.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHC02toHC04);
Async_Actor_Walk_To_XYZ(kActorMcCoy, -88.0f, 0.14f, -463.0f, 0, false);
Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC04);
diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp
index 584c3ceac4..48d6bae1b7 100644
--- a/engines/bladerunner/script/scene/hc04.cpp
+++ b/engines/bladerunner/script/scene/hc04.cpp
@@ -31,7 +31,11 @@ void SceneScriptHC04::InitializeScene() {
} else {
Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 1013);
}
- Music_Play(kMusicOneTime, 14, -90, 1, -1, 1, 2);
+ int loop = kMusicLoopRepeat;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopRepeatRandomStart;
+ }
+ Music_Play(kMusicOneTime, 14, -90, 1, -1, loop, 2);
Actor_Put_In_Set(kActorIsabella, kSetHC01_HC02_HC03_HC04);
Actor_Set_At_XYZ(kActorIsabella, -210.0f, 0.0f, -445.0f, 250);
@@ -119,7 +123,7 @@ bool SceneScriptHC04::ClickedOnItem(int itemId, bool a2) {
bool SceneScriptHC04::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -108.0f, 0.14f, -639.0f, 0, true, false, false)) {
- Music_Stop(2);
+ Music_Stop(2u);
Game_Flag_Set(kFlagHC04toRC03);
Game_Flag_Reset(kFlagMcCoyInHawkersCircle);
Game_Flag_Set(kFlagMcCoyInRunciters);
@@ -153,7 +157,7 @@ void SceneScriptHC04::PlayerWalkedIn() {
void SceneScriptHC04::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptHC04::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp
index 4ab73334bf..0218bd5a3d 100644
--- a/engines/bladerunner/script/scene/hf04.cpp
+++ b/engines/bladerunner/script/scene/hf04.cpp
@@ -95,7 +95,7 @@ bool SceneScriptHF04::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1132.27f, -0.31f, -113.46f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHF04toHF03);
Set_Enter(kSetHF02, kSceneHF02);
}
@@ -171,14 +171,14 @@ void SceneScriptHF04::PlayerWalkedIn() {
|| Actor_Query_Goal_Number(kActorLucy) == kGoalLucyHF04Run1
) {
Player_Set_Combat_Mode(true);
- Music_Play(kMusicBatl226M, 60, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 60, 0, 2, -1, kMusicLoopPlayOnce, 0);
}
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -45.0f, -0.31f, 307.0f, 0, false, true, false);
Delay(2500);
}
void SceneScriptHF04::PlayerWalkedOut() {
- Music_Stop(5);
+ Music_Stop(5u);
}
void SceneScriptHF04::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index 9bbb12114c..ad4c5171c4 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -257,7 +257,7 @@ void SceneScriptHF05::SceneFrameAdvanced(int frame) {
case 179:
Sound_Play(kSfxCAREXPL1, 90, 0, 0, 50);
- Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
break;
case 186:
@@ -326,7 +326,7 @@ void SceneScriptHF05::PlayerWalkedIn() {
&& !Game_Flag_Query(kFlagHF05PoliceArrived)
) {
Game_Flag_Set(kFlagHF05PoliceArrived);
- Music_Play(kMusicBatl226M, 40, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 40, 0, 2, -1, kMusicLoopPlayOnce, 0);
Actor_Says(kActorOfficerGrayford, 200, kAnimationModeTalk);
Actor_Says(kActorOfficerGrayford, 210, kAnimationModeTalk);
Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyPoliceWait120SecondsToAttackHF05);
@@ -370,7 +370,7 @@ void SceneScriptHF05::PlayerWalkedOut() {
Actor_Set_Goal_Number(kActorCrazylegs, kGoalCrazyLegsLeavesShowroom);
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptHF05::DialogueQueueFlushed(int a1) {
@@ -791,15 +791,15 @@ void SceneScriptHF05::talkWithCrazyLegs1() {
void SceneScriptHF05::addAmbientSounds() {
Ambient_Sounds_Add_Sound(kSfxSIREN2, 20, 80, 20, 100, -100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5u, 90u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
}
int SceneScriptHF05::getCompanionActor() {
diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp
index 4d8f8dacbd..ecca7a6459 100644
--- a/engines/bladerunner/script/scene/hf06.cpp
+++ b/engines/bladerunner/script/scene/hf06.cpp
@@ -147,7 +147,7 @@ bool SceneScriptHF06::ClickedOnExit(int exitId) {
Actor_Face_Heading(kActorMcCoy, 730, false);
Loop_Actor_Travel_Stairs(kActorMcCoy, 2, false, kAnimationModeIdle);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHF06toHF05);
Set_Enter(kSetHF05, kSceneHF05);
}
@@ -186,7 +186,7 @@ void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
if (otherActorId != -1) {
- Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
+ Music_Play(kMusicLoveSong, 35, 0, 3, -1, kMusicLoopPlayOnce, 0);
Player_Set_Combat_Mode(false);
Delay(1000);
Actor_Voice_Over(990, kActorVoiceOver);
@@ -248,7 +248,7 @@ void SceneScriptHF06::PlayerWalkedIn() {
}
void SceneScriptHF06::PlayerWalkedOut() {
- Music_Stop(2);
+ Music_Stop(2u);
}
void SceneScriptHF06::DialogueQueueFlushed(int a1) {
@@ -316,15 +316,15 @@ void SceneScriptHF06::steelInterruption() {
void SceneScriptHF06::addAmbientSounds() {
Ambient_Sounds_Add_Sound(kSfxSIREN2, 20, 80, 20, 100, -100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5u, 90u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
}
} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp
index 896823f4d1..191a1484f3 100644
--- a/engines/bladerunner/script/scene/kp03.cpp
+++ b/engines/bladerunner/script/scene/kp03.cpp
@@ -156,8 +156,8 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
- Music_Stop(2);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
+ Music_Stop(2u);
Game_Flag_Reset(kFlagKP01toKP03);
Game_Flag_Reset(kFlagKP05toKP03);
Game_Flag_Set(kFlagKP03toKP05);
@@ -169,8 +169,8 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -321.0f, -36.55f, 26.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
- Music_Stop(2);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
+ Music_Stop(2u);
Game_Flag_Reset(kFlagKP01toKP03);
Game_Flag_Reset(kFlagKP05toKP03);
Game_Flag_Set(kFlagKP03toKP01);
@@ -242,7 +242,7 @@ void SceneScriptKP03::SceneFrameAdvanced(int frame) {
if (bombTriggeredByActor == kActorSteele) {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP03Exploded);
- Music_Play(kMusicCrysDie1, 25, 0, 1, -1, 0, 0);
+ Music_Play(kMusicCrysDie1, 25, 0, 1, -1, kMusicLoopPlayOnce, 0);
if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorSteele) <= 120) {
bombTriggeredByActor = kActorMcCoy;
}
@@ -318,7 +318,7 @@ void SceneScriptKP03::saveSteele() {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, false, false, false);
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP05Enter);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Reset(kFlagKP01toKP03);
Game_Flag_Reset(kFlagKP05toKP03);
Game_Flag_Set(kFlagKP03toKP05);
diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index 30df872ea1..dacfa2fc02 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -146,7 +146,7 @@ void SceneScriptKP07::InitializeScene() {
void SceneScriptKP07::SceneLoaded() {
if (!Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
- Music_Play(kMusicClovDie1, 25, 0, 0, -1, 1, 0);
+ Music_Play(kMusicClovDie1, 25, 0, 0, -1, kMusicLoopRepeat, 0);
}
Obstacle_Object("BUNK_TRAY01", true);
Unobstacle_Object("BUNK_TRAY01", true);
@@ -177,7 +177,7 @@ bool SceneScriptKP07::ClickedOnActor(int actorId) {
if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07FlyAway);
} else {
- Music_Play(kMusicClovDies, 31, 0, 0, -1, 1, 0);
+ Music_Play(kMusicClovDies, 31, 0, 0, -1, kMusicLoopRepeat, 0);
Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07TalkToMcCoy);
}
return true;
@@ -207,7 +207,7 @@ bool SceneScriptKP07::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Set_Enter(kSetKP05_KP06, kSceneKP06);
}
@@ -250,7 +250,7 @@ void SceneScriptKP07::PlayerWalkedIn() {
}
void SceneScriptKP07::PlayerWalkedOut() {
- Music_Stop(3);
+ Music_Stop(3u);
}
void SceneScriptKP07::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp
index 0cae6d443f..7b7d8058a6 100644
--- a/engines/bladerunner/script/scene/ma02.cpp
+++ b/engines/bladerunner/script/scene/ma02.cpp
@@ -139,7 +139,7 @@ bool SceneScriptMA02::ClickedOnItem(int itemId, bool a2) {
bool SceneScriptMA02::ClickedOnExit(int exitId) {
if (exitId == kMA02ExitMA06) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, true, false, false)) {
- Music_Stop(10);
+ Music_Stop(10u);
Game_Flag_Set(kFlagMA02toMA06);
Set_Enter(kSetMA06, kSceneMA06);
}
@@ -193,7 +193,11 @@ void SceneScriptMA02::PlayerWalkedIn() {
) {
if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
Actor_Says(kActorMcCoy, 2390, kAnimationModeIdle);
- Music_Play(kMusicBRBlues, 25, 0, 3, -1, 0, 0);
+ if (_vm->_cutContent) {
+ Music_Play(kMusicBRBlues, 25, 0, 3, -1, kMusicLoopPlayOnceRandomStart, 0);
+ } else {
+ Music_Play(kMusicBRBlues, 25, 0, 3, -1, kMusicLoopPlayOnce, 0);
+ }
} else {
Actor_Says(kActorMcCoy, 2385, kAnimationModeTalk);
}
@@ -230,7 +234,7 @@ void SceneScriptMA02::PlayerWalkedIn() {
void SceneScriptMA02::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptMA02::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index f989327e9d..e522fd33bd 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -190,7 +190,11 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
} else {
phoneCallWithSteele();
}
- Music_Play(kMusicBRBlues, 52, 0, 3, -1, 0, 0);
+ if (_vm->_cutContent) {
+ Music_Play(kMusicBRBlues, 52, 0, 3, -1, kMusicLoopPlayOnceRandomStart, 0);
+ } else {
+ Music_Play(kMusicBRBlues, 52, 0, 3, -1, kMusicLoopPlayOnce, 0);
+ }
return false;
}
if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredZuben) && !Game_Flag_Query(kFlagMA04PhoneMessageFromClovis)) {
@@ -303,7 +307,7 @@ void SceneScriptMA04::PlayerWalkedIn() {
return;
}
if ((Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && !Game_Flag_Query(kFlagChapter1Ending)) {
- Music_Play(kMusicBRBlues, 52, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBRBlues, 52, 0, 2, -1, kMusicLoopPlayOnce, 0);
Player_Loses_Control();
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1677.0f, 0, true, false, false);
if (isPhoneMessageWaiting() || isPhoneRinging()) {
@@ -319,10 +323,10 @@ void SceneScriptMA04::PlayerWalkedIn() {
void SceneScriptMA04::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (Game_Flag_Query(kFlagChapter2Intro)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeMovieA, false, -1);
Game_Flag_Reset(kFlagChapter2Intro);
}
@@ -588,7 +592,7 @@ void SceneScriptMA04::turnOnTV() {
void SceneScriptMA04::sleep() {
if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BED-SHEETS", 12, true, false)) {
Actor_Says(kActorMcCoy, 8530, 12);
- Music_Stop(4);
+ Music_Stop(4u);
if (isPhoneMessageWaiting() || isPhoneRinging()) {
Overlay_Remove("MA04OVER");
}
diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp
index aa7bb65ef8..f89ec3955b 100644
--- a/engines/bladerunner/script/scene/ma05.cpp
+++ b/engines/bladerunner/script/scene/ma05.cpp
@@ -48,10 +48,10 @@ void SceneScriptMA05::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxROOFRAN1, 90, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxROOFAIR1, 40, -100, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 60, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 10, 70, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -94,7 +94,7 @@ bool SceneScriptMA05::ClickedOnExit(int exitId) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1579.0f, 0, false, false, false);
Game_Flag_Set(kFlagMA05toMA04);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 953.97f, 1685.0f, 0, false);
Set_Enter(kSetMA04, kSceneMA04);
}
@@ -118,7 +118,11 @@ void SceneScriptMA05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
void SceneScriptMA05::PlayerWalkedIn() {
- Music_Play(kMusicBRBlues, 52, 0, 2, -1, 0, 0);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
+ Music_Play(kMusicBRBlues, 52, 0, 2, -1, loop, 0);
if ((Random_Query(0, 4) == 1 || (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended))) && Global_Variable_Query(kVariableChapter) == 1) {
Scene_Loop_Set_Default(kMA05LoopMainLoop);
Scene_Loop_Start_Special(kSceneLoopModeOnce, kMA05LoopSpinner, true);
diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp
index 2c51c3056e..c193a4cb5c 100644
--- a/engines/bladerunner/script/scene/nr02.cpp
+++ b/engines/bladerunner/script/scene/nr02.cpp
@@ -142,10 +142,10 @@ bool SceneScriptNR02::ClickedOnExit(int exitId) {
if (Actor_Query_Goal_Number(kActorGordo) < kGoalGordoNR01WaitAndAttack
|| Actor_Query_Goal_Number(kActorGordo) > kGoalGordoNR01WaitAndTakeHostage
) {
- Music_Stop(2);
+ Music_Stop(2u);
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR02toNR01);
Set_Enter(kSetNR01, kSceneNR01);
}
@@ -191,7 +191,7 @@ void SceneScriptNR02::PlayerWalkedIn() {
}
void SceneScriptNR02::PlayerWalkedOut() {
- Music_Stop(2);
+ Music_Stop(2u);
// Gordo on the podium
if (Actor_Query_Goal_Number(kActorGordo) < kGoalGordoNR02TalkAboutMcCoy
@@ -244,12 +244,16 @@ void SceneScriptNR02::DialogueQueueFlushed(int a1) {
void SceneScriptNR02::playNextMusic() {
int track = Global_Variable_Query(kVariableTaffyLewisMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicTaffy2, 41, 0, 2, -1, 0, 0);
+ Music_Play(kMusicTaffy2, 41, 0, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicTaffy3, 41, 0, 2, -1, 0, 0);
+ Music_Play(kMusicTaffy3, 41, 0, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicTaffy4, 41, 0, 2, -1, 0, 0);
+ Music_Play(kMusicTaffy4, 41, 0, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp
index e56aeeeaef..cf87915ad0 100644
--- a/engines/bladerunner/script/scene/nr03.cpp
+++ b/engines/bladerunner/script/scene/nr03.cpp
@@ -144,7 +144,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 410.0f, -70.19f, -715.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR03toNR01);
Set_Enter(kSetNR01, kSceneNR01);
}
@@ -184,7 +184,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
#endif
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR03toNR04);
Set_Enter(kSetNR04, kSceneNR04);
}
@@ -236,7 +236,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
Actor_Face_Heading(kActorMcCoy, 656, false);
Actor_Change_Animation_Mode(kActorMcCoy, 53);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR03toNR05);
Set_Enter(kSetNR05_NR08, kSceneNR05);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kNR03LoopTableSwivel, false);
@@ -349,7 +349,7 @@ void SceneScriptNR03::PlayerWalkedIn() {
void SceneScriptNR03::PlayerWalkedOut() {
if (!Game_Flag_Query(kFlagNR03toNR04)) {
- Music_Stop(2);
+ Music_Stop(2u);
}
if (Game_Flag_Query(kFlagNR03toNR05)) {
Player_Gains_Control();
@@ -403,15 +403,19 @@ void SceneScriptNR03::rotateActorOnTable(int frame) {
void SceneScriptNR03::playNextMusic() {
if (Music_Is_Playing()) {
- Music_Adjust(51, 0, 2);
+ Music_Adjust(51, 0, 2u);
} else {
int track = Global_Variable_Query(kVariableEarlyQFrontMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicGothic2, 51, 0, 2, -1, 0, 0);
+ Music_Play(kMusicGothic2, 51, 0, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicGothic1, 51, 0, 2, -1, 0, 0);
+ Music_Play(kMusicGothic1, 51, 0, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicGothic3, 51, 0, 2, -1, 0, 0);
+ Music_Play(kMusicGothic3, 51, 0, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index 31851c4be8..ad0037dd01 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
void SceneScriptNR04::InitializeScene() {
- Music_Adjust(30, 80, 2);
+ Music_Adjust(30, 80, 2u);
Setup_Scene_Information(53.0f, 0.0f, -110.0f, 569);
@@ -155,7 +155,7 @@ bool SceneScriptNR04::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 45.0f, 0.0f, -106.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR04toNR03);
Set_Enter(kSetNR03, kSceneNR03);
}
@@ -319,8 +319,8 @@ void SceneScriptNR04::PlayerWalkedOut() {
#else
if (Game_Flag_Query(kFlagNR03McCoyThrownOut)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
- Music_Stop(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
+ Music_Stop(1u);
}
#endif // BLADERUNNER_ORIGINAL_BUGS
}
@@ -397,12 +397,16 @@ void SceneScriptNR04::druggedEffect(int frame) {
void SceneScriptNR04::playNextMusic() {
int track = Global_Variable_Query(kVariableEarlyQFrontMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicGothic2, 11, 80, 2, -1, 0, 0);
+ Music_Play(kMusicGothic2, 11, 80, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicGothic1, 11, 80, 2, -1, 0, 0);
+ Music_Play(kMusicGothic1, 11, 80, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicGothic3, 11, 80, 2, -1, 0, 0);
+ Music_Play(kMusicGothic3, 11, 80, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp
index e294f9ab2d..e9ffa251cd 100644
--- a/engines/bladerunner/script/scene/nr05.cpp
+++ b/engines/bladerunner/script/scene/nr05.cpp
@@ -134,7 +134,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -444.0f, 0.0f, -451.0f, 0, true, false, false)) {
Player_Loses_Control();
- Music_Stop(2);
+ Music_Stop(2u);
Player_Set_Combat_Mode(false);
Actor_Face_Heading(kActorMcCoy, 1021, false);
Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeSit);
@@ -207,7 +207,7 @@ void SceneScriptNR05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
void SceneScriptNR05::PlayerWalkedIn() {
if (Game_Flag_Query(kFlagNR08toNR05)) {
- Music_Stop(2);
+ Music_Stop(2u);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -697.56f, 0.0f, -174.86f, 0, true, false, false);
Game_Flag_Reset(kFlagNR08toNR05);
}
@@ -216,10 +216,10 @@ void SceneScriptNR05::PlayerWalkedIn() {
void SceneScriptNR05::PlayerWalkedOut() {
if (Game_Flag_Query(kFlagNR05toNR03)) {
- Music_Stop(2);
+ Music_Stop(2u);
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptNR05::DialogueQueueFlushed(int a1) {
@@ -408,15 +408,19 @@ void SceneScriptNR05::rotateActorOnGround(int actorId) {
void SceneScriptNR05::playNextMusic() {
if (Music_Is_Playing()) {
- Music_Adjust(51, 0, 2);
+ Music_Adjust(51, 0, 2u);
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr06.cpp b/engines/bladerunner/script/scene/nr06.cpp
index 1a0e87646b..744a86ef80 100644
--- a/engines/bladerunner/script/scene/nr06.cpp
+++ b/engines/bladerunner/script/scene/nr06.cpp
@@ -97,7 +97,7 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) {
Loop_Actor_Travel_Stairs(kActorMcCoy, 8, true, kAnimationModeIdle);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -36.0f, 0.37f, -373.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR06toNR08);
Set_Enter(kSetNR05_NR08, kSceneNR08);
}
@@ -135,7 +135,7 @@ void SceneScriptNR06::PlayerWalkedIn() {
void SceneScriptNR06::PlayerWalkedOut() {
if (Game_Flag_Query(kFlagNR06toNR07)) {
- Music_Stop(2);
+ Music_Stop(2u);
}
}
@@ -144,15 +144,19 @@ void SceneScriptNR06::DialogueQueueFlushed(int a1) {
void SceneScriptNR06::playNextMusic() {
if (Music_Is_Playing()) {
- Music_Adjust(31, 80, 2);
+ Music_Adjust(31, 80, 2u);
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index 9f94915b3e..b6108a7ac9 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -38,7 +38,7 @@ void SceneScriptNR08::InitializeScene() {
Scene_Loop_Set_Default(kNR08LoopMainLoop);
Setup_Scene_Information(-1102.88f, 0.0f, 107.43f, 0);
if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08Dance) {
- Music_Stop(1);
+ Music_Stop(1u);
}
} else if (Game_Flag_Query(kFlagNR06toNR08)) {
Setup_Scene_Information( -724.7f, 0.0f, 384.24f, 1000);
@@ -149,7 +149,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
&& frame < 91
) {
Set_Fade_Density((frame - 76) / 14.0f);
- Music_Stop(3);
+ Music_Stop(3u);
#if BLADERUNNER_ORIGINAL_BUGS
Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
#else
@@ -168,7 +168,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
&& frame < 135
) {
Set_Fade_Density((134 - frame) / 14.0f);
- Music_Play(kMusicArkDnce1, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
} else {
Actor_Set_Invisible(kActorMcCoy, false);
Set_Fade_Density(0.0f);
@@ -207,10 +207,10 @@ void SceneScriptNR08::PlayerWalkedIn() {
) {
Game_Flag_Set(kFlagNR08DektoraShow);
Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
- Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicArkdFly1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
Outtake_Play(kOuttakeDektora, true, -1);
} else {
- Music_Adjust(51, 0, 2);
+ Music_Adjust(51, 0, 2u);
}
if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08ReadyToRun) {
@@ -248,9 +248,9 @@ void SceneScriptNR08::PlayerWalkedIn() {
void SceneScriptNR08::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (!Game_Flag_Query(kFlagNR08toNR05)) {
- Music_Stop(2);
+ Music_Stop(2u);
}
}
@@ -259,17 +259,21 @@ void SceneScriptNR08::DialogueQueueFlushed(int a1) {
void SceneScriptNR08::playNextMusic() {
if (Music_Is_Playing()) {
- Music_Adjust(51, 0, 2);
+ Music_Adjust(51, 0, 2u);
} else if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08Dance) {
- Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicArkdFly1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp
index 9cd0b5a9da..4e1c67a879 100644
--- a/engines/bladerunner/script/scene/nr09.cpp
+++ b/engines/bladerunner/script/scene/nr09.cpp
@@ -27,7 +27,7 @@ namespace BladeRunner {
void SceneScriptNR09::InitializeScene() {
if (Game_Flag_Query(kFlagNR10toNR09)) {
if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) {
- Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 100, 2);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 100, 2u);
}
Game_Flag_Reset(kFlagNR10toNR09);
Setup_Scene_Information(-556.07f, 0.35f, 399.04f, 440);
@@ -84,7 +84,7 @@ bool SceneScriptNR09::ClickedOnExit(int exitId) {
if (exitId == 1) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
int v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -704.07f, 0.35f, 663.04f, 0, true, false, false);
if (!v1) {
Game_Flag_Set(kFlagNR09toNR08);
@@ -118,7 +118,7 @@ void SceneScriptNR09::PlayerWalkedIn() {
void SceneScriptNR09::PlayerWalkedOut() {
if (Game_Flag_Query(kFlagNR09toNR10)) {
- Music_Stop(2);
+ Music_Stop(2u);
}
}
@@ -127,15 +127,19 @@ void SceneScriptNR09::DialogueQueueFlushed(int a1) {
void SceneScriptNR09::playNextMusic() {
if (Music_Is_Playing()) {
- Music_Adjust(31, -80, 2);
+ Music_Adjust(31, -80, 2u);
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
+ int loop = kMusicLoopPlayOnce;
+ if (_vm->_cutContent && Random_Query(0, 2) == 1) {
+ loop = kMusicLoopPlayOnceRandomStart;
+ }
if (track == 0) {
- Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
} else if (track == 1) {
- Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
} else if (track == 2) {
- Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
}
++track;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index 065b775a71..71d5475c3c 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -37,7 +37,7 @@ void SceneScriptNR11::InitializeScene() {
Scene_Exit_Add_2D_Exit(0, 450, 305, 565, 345, 2);
if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) {
- Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 0, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 0, 1u);
}
Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 22, 0, 1);
@@ -181,7 +181,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
if (Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy) > 59
&& Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsNone
) {
- Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
+ Music_Play(kMusicLoveSong, 35, 0, 3, -1, kMusicLoopPlayOnce, 0);
}
Loop_Actor_Walk_To_XYZ(kActorDektora, -135.0f, 0.33f, -267.0f, 0, false, false, false);
Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
@@ -218,7 +218,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
Actor_Says(kActorDektora, 1080, 13);
Actor_Says(kActorMcCoy, 3875, 14);
Actor_Says(kActorDektora, 1090, 17);
- Music_Stop(4);
+ Music_Stop(4u);
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11WalkAway);
if (Global_Variable_Query(kVariableHollowayArrest) == 1) {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR10Wait);
diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp
index a0bad4224b..c6ca4d375f 100644
--- a/engines/bladerunner/script/scene/tb02.cpp
+++ b/engines/bladerunner/script/scene/tb02.cpp
@@ -33,7 +33,7 @@ void SceneScriptTB02::InitializeScene() {
Setup_Scene_Information(-32.0f, 0.0f, 1578.0f, 639);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); // TB_FLY_#.VQA Note: this is the only fly-through scene that is localized!
Setup_Scene_Information(-304.0f, -81.46f, 1434.0f, 250);
}
@@ -169,7 +169,7 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagTB02toTB03);
Game_Flag_Reset(kFlagTB02ElevatorToTB05);
Set_Enter(kSetTB02_TB03, kSceneTB03);
@@ -181,7 +181,7 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, 0.0f, 1578.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (Global_Variable_Query(kVariableChapter) < 4) {
Game_Flag_Set(kFlagTB05Entered);
Game_Flag_Set(kFlagTB02toTB05);
@@ -304,7 +304,7 @@ void SceneScriptTB02::PlayerWalkedIn() {
if (Actor_Query_Goal_Number(kActorTyrellGuard) == kGoalTyrellGuardSleeping) {
Actor_Set_Goal_Number(kActorTyrellGuard, kGoalTyrellGuardWakeUp);
}
- Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
} else {
Loop_Actor_Travel_Stairs(kActorMcCoy, 9, true, kAnimationModeIdle);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 0.79f, 1470.0f, 0, false, false, false);
@@ -385,7 +385,7 @@ void SceneScriptTB02::PlayerWalkedIn() {
void SceneScriptTB02::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
#if BLADERUNNER_ORIGINAL_BUGS
#else
if (Global_Variable_Query(kVariableChapter) < 4
diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp
index 4da6e7b6b2..45086d1966 100644
--- a/engines/bladerunner/script/scene/ug01.cpp
+++ b/engines/bladerunner/script/scene/ug01.cpp
@@ -126,7 +126,7 @@ bool SceneScriptUG01::ClickedOn3DObject(const char *objectName, bool a2) {
Scene_Loop_Set_Default(kUG01LoopMainLoopNoSteam);
Scene_Loop_Start_Special(kSceneLoopModeOnce, kUG01LoopSteamDissapating, false);
Sound_Play(kSfxSTEAM6A, 40, 0, 0, 50);
- Ambient_Sounds_Remove_Looping_Sound(kSfxSTMLOOP7, 2);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxSTMLOOP7, 2u);
#endif // BLADERUNNER_ORIGINAL_BUGS
Game_Flag_Set(kFlagUG01SteamOff);
} else {
@@ -216,7 +216,7 @@ void SceneScriptUG01::PlayerWalkedIn() {
}
if (Actor_Query_Goal_Number(kActorLucy) == kGoalLucyUG01Wait) {
- Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
+ Music_Play(kMusicLoveSong, 35, 0, 3, -1, kMusicLoopPlayOnce, 0);
Actor_Set_Goal_Number(kActorLucy, kGoalLucyUG01VoightKampff);
}
//return false;
@@ -224,7 +224,7 @@ void SceneScriptUG01::PlayerWalkedIn() {
void SceneScriptUG01::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
#if BLADERUNNER_ORIGINAL_BUGS
#else
Screen_Effect_Restore_All(false);
diff --git a/engines/bladerunner/ui/end_credits.cpp b/engines/bladerunner/ui/end_credits.cpp
index b3c74b1d04..330d680e55 100644
--- a/engines/bladerunner/ui/end_credits.cpp
+++ b/engines/bladerunner/ui/end_credits.cpp
@@ -50,10 +50,10 @@ void EndCredits::show() {
_vm->_mouse->disable();
_vm->_mixer->stopAll();
_vm->_ambientSounds->removeAllNonLoopingSounds(true);
- _vm->_ambientSounds->removeAllLoopingSounds(4);
+ _vm->_ambientSounds->removeAllLoopingSounds(4u);
_vm->_audioSpeech->stopSpeech();
- _vm->_music->play(_vm->_gameInfo->getMusicTrack(kMusicCredits), 100, 0, 2, -1, 0, 3);
+ _vm->_music->play(_vm->_gameInfo->getMusicTrack(kMusicCredits), 100, 0, 2, -1, kMusicLoopPlayOnce, 3);
Font *fontBig = Font::load(_vm, "TAHOMA24.FON", 1, true);
Font *fontSmall = Font::load(_vm, "TAHOMA18.FON", 1, true);
@@ -157,7 +157,7 @@ void EndCredits::show() {
delete fontSmall;
delete fontBig;
- _vm->_music->stop(0);
+ _vm->_music->stop(0u);
_vm->_mouse->enable();
}
Commit: f3113cf45d106d9c5b5b64eff8c10be04cb52b38
https://github.com/scummvm/scummvm/commit/f3113cf45d106d9c5b5b64eff8c10be04cb52b38
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-14T16:27:19+03:00
Commit Message:
BLADERUNNER: More precise naming for time delay vars and parameters
Also use u suffix for unsigned int literal parameters (WIP)
Changed paths:
engines/bladerunner/actor.cpp
engines/bladerunner/actor.h
engines/bladerunner/actor_dialogue_queue.cpp
engines/bladerunner/actor_dialogue_queue.h
engines/bladerunner/ambient_sounds.cpp
engines/bladerunner/ambient_sounds.h
engines/bladerunner/audio_player.cpp
engines/bladerunner/audio_player.h
engines/bladerunner/audio_speech.cpp
engines/bladerunner/bladerunner.cpp
engines/bladerunner/movement_track.cpp
engines/bladerunner/movement_track.h
engines/bladerunner/script/ai/clovis.cpp
engines/bladerunner/script/ai/dektora.cpp
engines/bladerunner/script/ai/holloway.cpp
engines/bladerunner/script/ai/izo.cpp
engines/bladerunner/script/ai/lucy.cpp
engines/bladerunner/script/ai/luther.cpp
engines/bladerunner/script/ai/mccoy.cpp
engines/bladerunner/script/ai/sadik.cpp
engines/bladerunner/script/ai/steele.cpp
engines/bladerunner/script/ai/zuben.cpp
engines/bladerunner/script/scene/bb01.cpp
engines/bladerunner/script/scene/bb02.cpp
engines/bladerunner/script/scene/bb03.cpp
engines/bladerunner/script/scene/bb04.cpp
engines/bladerunner/script/scene/bb05.cpp
engines/bladerunner/script/scene/bb06.cpp
engines/bladerunner/script/scene/bb07.cpp
engines/bladerunner/script/scene/bb08.cpp
engines/bladerunner/script/scene/bb09.cpp
engines/bladerunner/script/scene/bb10.cpp
engines/bladerunner/script/scene/bb12.cpp
engines/bladerunner/script/scene/bb51.cpp
engines/bladerunner/script/scene/ct03.cpp
engines/bladerunner/script/scene/ct04.cpp
engines/bladerunner/script/scene/ct05.cpp
engines/bladerunner/script/scene/ct06.cpp
engines/bladerunner/script/scene/ct07.cpp
engines/bladerunner/script/scene/ct08.cpp
engines/bladerunner/script/scene/ct09.cpp
engines/bladerunner/script/scene/ct10.cpp
engines/bladerunner/script/scene/ct11.cpp
engines/bladerunner/script/scene/ct12.cpp
engines/bladerunner/script/scene/ct51.cpp
engines/bladerunner/script/scene/dr01.cpp
engines/bladerunner/script/scene/dr02.cpp
engines/bladerunner/script/scene/dr03.cpp
engines/bladerunner/script/scene/dr04.cpp
engines/bladerunner/script/scene/dr06.cpp
engines/bladerunner/script/scene/hc03.cpp
engines/bladerunner/script/scene/hf01.cpp
engines/bladerunner/script/scene/hf02.cpp
engines/bladerunner/script/scene/hf03.cpp
engines/bladerunner/script/scene/hf07.cpp
engines/bladerunner/script/scene/kp01.cpp
engines/bladerunner/script/scene/kp02.cpp
engines/bladerunner/script/scene/kp04.cpp
engines/bladerunner/script/scene/kp05.cpp
engines/bladerunner/script/scene/kp06.cpp
engines/bladerunner/script/scene/ma01.cpp
engines/bladerunner/script/scene/ma06.cpp
engines/bladerunner/script/scene/ma07.cpp
engines/bladerunner/script/scene/nr01.cpp
engines/bladerunner/script/scene/nr07.cpp
engines/bladerunner/script/scene/nr10.cpp
engines/bladerunner/script/scene/ps01.cpp
engines/bladerunner/script/scene/ps02.cpp
engines/bladerunner/script/scene/ps03.cpp
engines/bladerunner/script/scene/ps04.cpp
engines/bladerunner/script/scene/ps05.cpp
engines/bladerunner/script/scene/ps06.cpp
engines/bladerunner/script/scene/ps09.cpp
engines/bladerunner/script/scene/ps13.cpp
engines/bladerunner/script/scene/ps15.cpp
engines/bladerunner/script/scene/rc01.cpp
engines/bladerunner/script/scene/rc02.cpp
engines/bladerunner/script/scene/rc03.cpp
engines/bladerunner/script/scene/tb03.cpp
engines/bladerunner/script/scene/tb05.cpp
engines/bladerunner/script/scene/tb06.cpp
engines/bladerunner/script/scene/tb07.cpp
engines/bladerunner/script/scene/ug02.cpp
engines/bladerunner/script/scene/ug03.cpp
engines/bladerunner/script/scene/ug04.cpp
engines/bladerunner/script/scene/ug05.cpp
engines/bladerunner/script/scene/ug06.cpp
engines/bladerunner/script/scene/ug07.cpp
engines/bladerunner/script/scene/ug08.cpp
engines/bladerunner/script/scene/ug09.cpp
engines/bladerunner/script/scene/ug10.cpp
engines/bladerunner/script/scene/ug12.cpp
engines/bladerunner/script/scene/ug13.cpp
engines/bladerunner/script/scene/ug14.cpp
engines/bladerunner/script/scene/ug15.cpp
engines/bladerunner/script/scene/ug16.cpp
engines/bladerunner/script/scene/ug17.cpp
engines/bladerunner/script/scene/ug18.cpp
engines/bladerunner/script/scene/ug19.cpp
engines/bladerunner/script/script.cpp
engines/bladerunner/script/script.h
engines/bladerunner/settings.cpp
engines/bladerunner/ui/spinner.cpp
diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index 0beb1a8e94..f57ff55c78 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -263,10 +263,10 @@ void Actor::increaseFPS() {
#endif // BLADERUNNER_ORIGINAL_BUGS
}
-void Actor::timerStart(int timerId, int32 interval) {
+void Actor::timerStart(int timerId, int32 intervalMillis) {
assert(timerId >= 0 && timerId < kActorTimers);
- _timersLeft[timerId] = interval;
+ _timersLeft[timerId] = intervalMillis;
_timersLast[timerId] = _vm->_time->current();
}
@@ -376,14 +376,14 @@ void Actor::movementTrackNext(bool omitAiScript) {
bool hasNextMovement;
bool running;
int angle;
- int32 delay;
+ int32 delayMillis;
int waypointId;
Vector3 waypointPosition;
bool arrived;
- hasNextMovement = _movementTrack->next(&waypointId, &delay, &angle, &running);
+ hasNextMovement = _movementTrack->next(&waypointId, &delayMillis, &angle, &running);
_movementTrackNextWaypointId = waypointId;
- _movementTrackNextDelay = delay;
+ _movementTrackNextDelay = delayMillis;
_movementTrackNextAngle = angle;
_movementTrackNextRunning = running;
if (hasNextMovement) {
@@ -397,7 +397,7 @@ void Actor::movementTrackNext(bool omitAiScript) {
_walkInfo->setup(_id, running, _position, waypointPosition, false, &arrived);
_movementTrackWalkingToWaypointId = waypointId;
- _movementTrackDelayOnNextWaypoint = delay;
+ _movementTrackDelayOnNextWaypoint = delayMillis;
if (arrived) {
movementTrackWaypointReached();
}
@@ -406,13 +406,13 @@ void Actor::movementTrackNext(bool omitAiScript) {
setAtXYZ(waypointPosition, angle, true, false, false);
- if (!delay) {
- delay = 1;
+ if (!delayMillis) {
+ delayMillis = 1;
}
- if (delay > 1) {
+ if (delayMillis > 1) {
changeAnimationMode(kAnimationModeIdle, false);
}
- timerStart(kActorTimerMovementTrack, delay);
+ timerStart(kActorTimerMovementTrack, delayMillis);
}
//return true;
} else {
diff --git a/engines/bladerunner/actor.h b/engines/bladerunner/actor.h
index 36bfde8e32..e58c2e8df3 100644
--- a/engines/bladerunner/actor.h
+++ b/engines/bladerunner/actor.h
@@ -144,7 +144,7 @@ public:
void setFPS(int fps);
void increaseFPS();
- void timerStart(int timerId, int32 interval);
+ void timerStart(int timerId, int32 intervalMillis);
void timerReset(int timerId);
int32 timerLeft(int timerId);
void timersUpdate();
diff --git a/engines/bladerunner/actor_dialogue_queue.cpp b/engines/bladerunner/actor_dialogue_queue.cpp
index 6c259c78bc..23c62ad922 100644
--- a/engines/bladerunner/actor_dialogue_queue.cpp
+++ b/engines/bladerunner/actor_dialogue_queue.cpp
@@ -38,7 +38,7 @@ ActorDialogueQueue::Entry::Entry() {
isNotPause = false;
isPause = false;
actorId = -1;
- delay = -1;
+ delayMillis = -1;
sentenceId = -1;
animationMode = -1;
}
@@ -62,13 +62,13 @@ void ActorDialogueQueue::add(int actorId, int sentenceId, int animationMode) {
entry.actorId = actorId;
entry.sentenceId = sentenceId;
entry.animationMode = animationMode;
- entry.delay = -1;
+ entry.delayMillis = -1;
_entries.push_back(entry);
}
}
-void ActorDialogueQueue::addPause(int32 delay) {
+void ActorDialogueQueue::addPause(int32 delayMillis) {
if (_entries.size() < kMaxEntries) {
Entry entry;
entry.isNotPause = false;
@@ -76,7 +76,7 @@ void ActorDialogueQueue::addPause(int32 delay) {
entry.actorId = -1;
entry.sentenceId = -1;
entry.animationMode = -1;
- entry.delay = delay;
+ entry.delayMillis = delayMillis;
_entries.push_back(entry);
}
@@ -96,7 +96,7 @@ void ActorDialogueQueue::flush(int a1, bool callScript) {
}
if (_isPause) {
_isPause = false;
- _delay = 0;
+ _delayMillis = 0;
_timeLast = 0u;
}
clear();
@@ -116,7 +116,7 @@ bool ActorDialogueQueue::isEmpty() {
&& _sentenceId == -1 \
&& _animationMode == -1 \
&& _animationModePrevious == -1 \
- && _delay == 0 \
+ && _delayMillis == 0 \
&& _timeLast == 0u;
}
@@ -126,12 +126,12 @@ void ActorDialogueQueue::tick() {
uint32 time = _vm->_time->current();
uint32 timeDiff = time - _timeLast; // unsigned difference is intentional
_timeLast = time;
- _delay = (_delay < 0 || ((uint32)_delay < timeDiff) ) ? 0 : ((uint32)_delay - timeDiff);
- if (_delay > 0) {
+ _delayMillis = (_delayMillis < 0 || ((uint32)_delayMillis < timeDiff) ) ? 0 : ((uint32)_delayMillis - timeDiff);
+ if (_delayMillis > 0) {
return;
}
_isPause = false;
- _delay = 0;
+ _delayMillis = 0;
_timeLast = 0u;
if (_entries.empty()) {
flush(0, true);
@@ -169,7 +169,7 @@ void ActorDialogueQueue::tick() {
}
} else if (firstEntry.isPause) {
_isPause = true;
- _delay = firstEntry.delay;
+ _delayMillis = firstEntry.delayMillis;
_timeLast = _vm->_time->current();
}
}
@@ -186,7 +186,7 @@ void ActorDialogueQueue::save(SaveFileWriteStream &f) {
f.writeInt(e.actorId);
f.writeInt(e.sentenceId);
f.writeInt(e.animationMode);
- f.writeInt(e.delay);
+ f.writeInt(e.delayMillis);
}
f.padBytes((kMaxEntries - count) * 24);
@@ -196,7 +196,7 @@ void ActorDialogueQueue::save(SaveFileWriteStream &f) {
f.writeInt(_animationMode);
f.writeInt(_animationModePrevious);
f.writeBool(_isPause);
- f.writeInt(_delay);
+ f.writeInt(_delayMillis);
// f.write(_timeLast);
}
@@ -212,7 +212,7 @@ void ActorDialogueQueue::load(SaveFileReadStream &f) {
e.actorId = f.readInt();
e.sentenceId = f.readInt();
e.animationMode = f.readInt();
- e.delay = f.readInt();
+ e.delayMillis = f.readInt();
}
f.skip((kMaxEntries - count) * 24);
@@ -223,7 +223,7 @@ void ActorDialogueQueue::load(SaveFileReadStream &f) {
_animationMode = f.readInt();
_animationModePrevious = f.readInt();
_isPause = f.readBool();
- _delay = f.readInt();
+ _delayMillis = f.readInt();
_timeLast = 0u;
}
@@ -235,7 +235,7 @@ void ActorDialogueQueue::clear() {
_animationMode = -1;
_animationModePrevious = -1;
_isPause = false;
- _delay = 0;
+ _delayMillis = 0;
_timeLast = 0u;
}
diff --git a/engines/bladerunner/actor_dialogue_queue.h b/engines/bladerunner/actor_dialogue_queue.h
index 90662e7924..fa31568822 100644
--- a/engines/bladerunner/actor_dialogue_queue.h
+++ b/engines/bladerunner/actor_dialogue_queue.h
@@ -40,7 +40,7 @@ class ActorDialogueQueue {
int actorId;
int sentenceId;
int animationMode;
- int32 delay;
+ int32 delayMillis; // in milliseconds, TODO: Info on special values 0 and -1?
Entry();
};
@@ -54,15 +54,15 @@ class ActorDialogueQueue {
int _animationMode;
int _animationModePrevious;
bool _isPause;
- int32 _delay;
- uint32 _timeLast;
+ int32 _delayMillis; // in milliseconds, TODO: Info on special values 0 and -1?
+ uint32 _timeLast; // in milliseconds
public:
ActorDialogueQueue(BladeRunnerEngine *vm);
~ActorDialogueQueue();
void add(int actorId, int sentenceId, int animationMode);
- void addPause(int32 delay);
+ void addPause(int32 delayMillis);
void flush(int a1, bool callScript);
bool isEmpty();
void tick();
diff --git a/engines/bladerunner/ambient_sounds.cpp b/engines/bladerunner/ambient_sounds.cpp
index 0c8357d7a7..0abb8f907b 100644
--- a/engines/bladerunner/ambient_sounds.cpp
+++ b/engines/bladerunner/ambient_sounds.cpp
@@ -75,7 +75,7 @@ static inline void sort(uint32 *a, uint32 *b) {
void AmbientSounds::addSound(
int sfxId,
- uint32 timeMin, uint32 timeMax,
+ uint32 delayMinSeconds, uint32 delayMaxSeconds,
int volumeMin, int volumeMax,
int panStartMin, int panStartMax,
int panEndMin, int panEndMax,
@@ -83,7 +83,7 @@ void AmbientSounds::addSound(
#if BLADERUNNER_ORIGINAL_BUGS
#else
- sort(&timeMin, &timeMax);
+ sort(&delayMinSeconds, &delayMaxSeconds);
#endif // BLADERUNNER_ORIGINAL_BUGS
sort(&volumeMin, &volumeMax);
sort(&panStartMin, &panStartMax);
@@ -91,7 +91,7 @@ void AmbientSounds::addSound(
addSoundByName(
_vm->_gameInfo->getSfxTrack(sfxId),
- timeMin, timeMax,
+ delayMinSeconds, delayMaxSeconds,
volumeMin, volumeMax,
panStartMin, panStartMax,
panEndMin, panEndMax,
@@ -113,10 +113,10 @@ void AmbientSounds::removeAllNonLoopingSounds(bool stopPlaying) {
}
}
-void AmbientSounds::addSpeech(int actorId, int sentenceId, uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk) {
+void AmbientSounds::addSpeech(int actorId, int sentenceId, uint32 delayMinSeconds, uint32 delayMaxSeconds, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk) {
#if BLADERUNNER_ORIGINAL_BUGS
#else
- sort(&timeMin, &timeMax);
+ sort(&delayMinSeconds, &delayMaxSeconds);
#endif // BLADERUNNER_ORIGINAL_BUGS
sort(&volumeMin, &volumeMax);
sort(&panStartMin, &panStartMax);
@@ -124,7 +124,7 @@ void AmbientSounds::addSpeech(int actorId, int sentenceId, uint32 timeMin, uint3
Common::String name = Common::String::format( "%02d-%04d%s.AUD", actorId, sentenceId, _vm->_languageCode.c_str());
addSoundByName(name,
- timeMin, timeMax,
+ delayMinSeconds, delayMaxSeconds,
volumeMin, volumeMax,
panStartMin, panStartMax,
panEndMin, panEndMax,
@@ -140,7 +140,7 @@ void AmbientSounds::playSpeech(int actorId, int sentenceId, int volume, int panS
_vm->_audioPlayer->playAud(name, volume * _ambientVolume / 100, panStart, panEnd, priority, kAudioPlayerOverrideVolume, Audio::Mixer::kSpeechSoundType);
}
-void AmbientSounds::addLoopingSound(int sfxId, int volume, int pan, uint32 delay) {
+void AmbientSounds::addLoopingSound(int sfxId, int volume, int pan, uint32 delaySeconds) {
const Common::String &name = _vm->_gameInfo->getSfxTrack(sfxId);
int32 hash = MIXArchive::getHash(name);
@@ -163,48 +163,48 @@ void AmbientSounds::addLoopingSound(int sfxId, int volume, int pan, uint32 delay
int actualVolumeStart = volume * _ambientVolume / 100;
int actualVolumeEnd = actualVolumeStart;
- if (delay > 0u) {
+ if (delaySeconds > 0u) {
actualVolumeStart = 0;
}
track.audioPlayerTrack = _vm->_audioPlayer->playAud(name, actualVolumeStart, pan, pan, 99, kAudioPlayerLoop | kAudioPlayerOverrideVolume);
if (track.audioPlayerTrack == -1) {
- removeLoopingSoundByIndex(i, 0);
+ removeLoopingSoundByIndex(i, 0u);
} else {
- if (delay) {
- _vm->_audioPlayer->adjustVolume(track.audioPlayerTrack, actualVolumeEnd, delay, false);
+ if (delaySeconds) {
+ _vm->_audioPlayer->adjustVolume(track.audioPlayerTrack, actualVolumeEnd, delaySeconds, false);
}
}
}
-void AmbientSounds::adjustLoopingSound(int sfxId, int volume, int pan, uint32 delay) {
+void AmbientSounds::adjustLoopingSound(int sfxId, int volume, int pan, uint32 delaySeconds) {
int32 hash = MIXArchive::getHash(_vm->_gameInfo->getSfxTrack(sfxId));
int index = findLoopingTrackByHash(hash);
if (index >= 0 && _loopingSounds[index].audioPlayerTrack != -1 && _vm->_audioPlayer->isActive(_loopingSounds[index].audioPlayerTrack)) {
if (volume != -1) {
_loopingSounds[index].volume = volume;
- _vm->_audioPlayer->adjustVolume(_loopingSounds[index].audioPlayerTrack, _ambientVolume * volume / 100, delay, false);
+ _vm->_audioPlayer->adjustVolume(_loopingSounds[index].audioPlayerTrack, _ambientVolume * volume / 100, delaySeconds, false);
}
if (pan != -101) {
_loopingSounds[index].pan = pan;
- _vm->_audioPlayer->adjustPan(_loopingSounds[index].audioPlayerTrack, pan, delay);
+ _vm->_audioPlayer->adjustPan(_loopingSounds[index].audioPlayerTrack, pan, delaySeconds);
}
}
}
-void AmbientSounds::removeLoopingSound(int sfxId, uint32 delay) {
+void AmbientSounds::removeLoopingSound(int sfxId, uint32 delaySeconds) {
int32 hash = MIXArchive::getHash(_vm->_gameInfo->getSfxTrack(sfxId));
int index = findLoopingTrackByHash(hash);
if (index >= 0) {
- removeLoopingSoundByIndex(index, delay);
+ removeLoopingSoundByIndex(index, delaySeconds);
}
}
-void AmbientSounds::removeAllLoopingSounds(uint32 delay) {
+void AmbientSounds::removeAllLoopingSounds(uint32 delaySeconds) {
for (int i = 0; i < kLoopingSounds; ++i) {
- removeLoopingSoundByIndex(i, delay);
+ removeLoopingSoundByIndex(i, delaySeconds);
}
}
@@ -237,7 +237,7 @@ void AmbientSounds::tick() {
kAudioPlayerOverrideVolume);
track.nextPlayTimeStart = now;
- track.nextPlayTimeDiff = _vm->_rnd.getRandomNumberRng(track.timeMin, track.timeMax);
+ track.nextPlayTimeDiff = _vm->_rnd.getRandomNumberRng(track.delayMin, track.delayMax);
}
}
@@ -251,7 +251,7 @@ void AmbientSounds::setVolume(int volume) {
} else {
_loopingSounds[i].audioPlayerTrack = _vm->_audioPlayer->playAud(_loopingSounds[i].name, 1, _loopingSounds[i].pan, _loopingSounds[i].pan, 99, kAudioPlayerLoop | kAudioPlayerOverrideVolume);
if (_loopingSounds[i].audioPlayerTrack == -1) {
- removeLoopingSound(i, 0);
+ removeLoopingSound(i, 0u);
} else {
_vm->_audioPlayer->adjustVolume(_loopingSounds[i].audioPlayerTrack, newVolume, 1u, false);
}
@@ -316,7 +316,7 @@ int AmbientSounds::findLoopingTrackByHash(int32 hash) const {
void AmbientSounds::addSoundByName(
const Common::String &name,
- uint32 timeMin, uint32 timeMax,
+ uint32 delayMinSeconds, uint32 delayMaxSeconds,
int volumeMin, int volumeMax,
int panStartMin, int panStartMax,
int panEndMin, int panEndMax,
@@ -333,7 +333,7 @@ void AmbientSounds::addSoundByName(
#if BLADERUNNER_ORIGINAL_BUGS
#else
- sort(&timeMin, &timeMax);
+ sort(&delayMinSeconds, &delayMaxSeconds);
sort(&volumeMin, &volumeMax);
sort(&panStartMin, &panStartMax);
sort(&panEndMin, &panEndMax);
@@ -342,10 +342,10 @@ void AmbientSounds::addSoundByName(
track.isActive = true;
track.name = name;
track.hash = MIXArchive::getHash(name);
- track.timeMin = 1000u * timeMin;
- track.timeMax = 1000u * timeMax;
+ track.delayMin = 1000u * delayMinSeconds; // store as milliseconds
+ track.delayMax = 1000u * delayMaxSeconds; // store as milliseconds
track.nextPlayTimeStart = now;
- track.nextPlayTimeDiff = _vm->_rnd.getRandomNumberRng(track.timeMin, track.timeMax);
+ track.nextPlayTimeDiff = _vm->_rnd.getRandomNumberRng(track.delayMin, track.delayMax);
track.volumeMin = volumeMin;
track.volumeMax = volumeMax;
track.volume = 0;
@@ -368,11 +368,11 @@ void AmbientSounds::removeNonLoopingSoundByIndex(int index, bool stopPlaying) {
// track.field_45 = 0;
}
-void AmbientSounds::removeLoopingSoundByIndex(int index, uint32 delay) {
+void AmbientSounds::removeLoopingSoundByIndex(int index, uint32 delaySeconds) {
LoopingSound &track = _loopingSounds[index];
if (track.isActive && track.audioPlayerTrack != -1 && _vm->_audioPlayer->isActive(track.audioPlayerTrack)) {
- if (delay > 0u) {
- _vm->_audioPlayer->adjustVolume(track.audioPlayerTrack, 0, delay, false);
+ if (delaySeconds > 0u) {
+ _vm->_audioPlayer->adjustVolume(track.audioPlayerTrack, 0, delaySeconds, false);
} else {
_vm->_audioPlayer->stop(track.audioPlayerTrack, false);
}
@@ -395,8 +395,8 @@ void AmbientSounds::save(SaveFileWriteStream &f) {
f.writeStringSz(track.name, 13);
f.writeSint32LE(track.hash);
f.writeInt(-1); // track.audioPlayerTrack is not used after load
- f.writeInt(track.timeMin);
- f.writeInt(track.timeMax);
+ f.writeInt(track.delayMin);
+ f.writeInt(track.delayMax);
f.writeInt(0); // track.nextPlayTime is not used after load
f.writeInt(track.volumeMin);
f.writeInt(track.volumeMax);
@@ -422,7 +422,7 @@ void AmbientSounds::save(SaveFileWriteStream &f) {
}
void AmbientSounds::load(SaveFileReadStream &f) {
- removeAllLoopingSounds(0);
+ removeAllLoopingSounds(0u);
removeAllNonLoopingSounds(true);
f.skip(4); // _isDisabled - not used
@@ -436,15 +436,15 @@ void AmbientSounds::load(SaveFileReadStream &f) {
track.hash = f.readSint32LE();
f.skip(4); // track.audioPlayerTrack is not used after load
track.audioPlayerTrack = -1;
- track.timeMin = (uint32)f.readInt();
- track.timeMax = (uint32)f.readInt();
+ track.delayMin = (uint32)f.readInt();
+ track.delayMax = (uint32)f.readInt();
f.skip(4); // track.nextPlayTime is not used after load
track.nextPlayTimeStart = now;
#if BLADERUNNER_ORIGINAL_BUGS
#else
- sort(&(track.timeMin), &(track.timeMax));
+ sort(&(track.delayMin), &(track.delayMax));
#endif // BLADERUNNER_ORIGINAL_BUGS
- track.nextPlayTimeDiff = _vm->_rnd.getRandomNumberRng(track.timeMin, track.timeMax);
+ track.nextPlayTimeDiff = _vm->_rnd.getRandomNumberRng(track.delayMin, track.delayMax);
track.volumeMin = f.readInt();
track.volumeMax = f.readInt();
track.volume = f.readInt();
@@ -478,7 +478,7 @@ void AmbientSounds::load(SaveFileReadStream &f) {
if (track.isActive) {
track.audioPlayerTrack = _vm->_audioPlayer->playAud(track.name, 1, track.pan, track.pan, 99, kAudioPlayerLoop | kAudioPlayerOverrideVolume);
if (track.audioPlayerTrack == -1) {
- removeLoopingSoundByIndex(i, 0);
+ removeLoopingSoundByIndex(i, 0u);
} else {
_vm->_audioPlayer->adjustVolume(track.audioPlayerTrack, _ambientVolume * track.volume / 100, 2u, false);
}
diff --git a/engines/bladerunner/ambient_sounds.h b/engines/bladerunner/ambient_sounds.h
index 73b8e7535d..14145a0c67 100644
--- a/engines/bladerunner/ambient_sounds.h
+++ b/engines/bladerunner/ambient_sounds.h
@@ -42,10 +42,10 @@ class AmbientSounds {
Common::String name;
int32 hash;
int audioPlayerTrack;
- uint32 timeMin;
- uint32 timeMax;
- uint32 nextPlayTimeStart;
- uint32 nextPlayTimeDiff;
+ uint32 delayMin; // milliseconds
+ uint32 delayMax; // milliseconds
+ uint32 nextPlayTimeStart; // milliseconds
+ uint32 nextPlayTimeDiff; // milliseconds
int volumeMin;
int volumeMax;
int volume;
@@ -77,7 +77,7 @@ public:
void addSound(
int sfxId,
- uint32 timeMin, uint32 timeMax,
+ uint32 delayMinSeconds, uint32 delayMaxSeconds,
int volumeMin, int volumeMax,
int panStartMin, int panStartMax,
int panEndMin, int panEndMax,
@@ -88,7 +88,7 @@ public:
void addSpeech(
int actorId, int sentenceId,
- uint32 timeMin, uint32 timeMax,
+ uint32 delayMinSeconds, uint32 delayMaxSeconds,
int volumeMin, int volumeMax,
int panStartMin, int panStartMax,
int panEndMin, int panEndMax,
@@ -96,12 +96,12 @@ public:
void playSound(int sfxId, int volume, int panStart, int panEnd, int priority);
void playSpeech(int actorId, int sentenceId, int volume, int panStart, int panEnd, int priority);
- void addLoopingSound(int sfxId, int volume, int pan, uint32 delay);
- void adjustLoopingSound(int sfxId, int volume, int pan, uint32 delay);
+ void addLoopingSound(int sfxId, int volume, int pan, uint32 delaySeconds);
+ void adjustLoopingSound(int sfxId, int volume, int pan, uint32 delaySeconds);
// it seems there is little confusion in original code about delay parameter,
// sometimes it is used as boolean in same way as stopPlaying from non looping
- void removeLoopingSound(int sfxId, uint32 delay);
- void removeAllLoopingSounds(uint32 delay);
+ void removeLoopingSound(int sfxId, uint32 delaySeconds);
+ void removeAllLoopingSounds(uint32 delaySeconds);
void tick();
@@ -121,14 +121,14 @@ private:
void addSoundByName(
const Common::String &name,
- uint32 timeMin, uint32 timeMax,
+ uint32 delayMinSeconds, uint32 delayMaxSeconds,
int volumeMin, int volumeMax,
int panStartMin, int panStartMax,
int panEndMin, int panEndMax,
int priority, int unk);
void removeNonLoopingSoundByIndex(int index, bool stopPlaying);
- void removeLoopingSoundByIndex(int index, uint32 delay);
+ void removeLoopingSoundByIndex(int index, uint32 delaySeconds);
};
} // End of namespace BladeRunner
diff --git a/engines/bladerunner/audio_player.cpp b/engines/bladerunner/audio_player.cpp
index 389716ecf5..265ad46b93 100644
--- a/engines/bladerunner/audio_player.cpp
+++ b/engines/bladerunner/audio_player.cpp
@@ -66,7 +66,7 @@ void AudioPlayer::stopAll() {
}
}
-void AudioPlayer::adjustVolume(int track, int volume, uint32 delay, bool overrideVolume) {
+void AudioPlayer::adjustVolume(int track, int volume, uint32 delaySeconds, bool overrideVolume) {
if (track < 0 || track >= kTracks || !_tracks[track].isActive || _tracks[track].channel == -1) {
return;
}
@@ -77,16 +77,16 @@ void AudioPlayer::adjustVolume(int track, int volume, uint32 delay, bool overrid
}
_tracks[track].volume = actualVolume;
- _vm->_audioMixer->adjustVolume(_tracks[track].channel, actualVolume, 60u * delay);
+ _vm->_audioMixer->adjustVolume(_tracks[track].channel, actualVolume, 60u * delaySeconds);
}
-void AudioPlayer::adjustPan(int track, int pan, uint32 delay) {
+void AudioPlayer::adjustPan(int track, int pan, uint32 delaySeconds) {
if (track < 0 || track >= kTracks || !_tracks[track].isActive || _tracks[track].channel == -1) {
return;
}
_tracks[track].pan = pan;
- _vm->_audioMixer->adjustPan(_tracks[track].channel, pan, 60u * delay);
+ _vm->_audioMixer->adjustPan(_tracks[track].channel, pan, 60u * delaySeconds);
}
void AudioPlayer::setVolume(int volume) {
@@ -213,7 +213,7 @@ int AudioPlayer::playAud(const Common::String &name, int volume, int panStart, i
}
if (panStart != panEnd) {
- _vm->_audioMixer->adjustPan(channel, panEnd, (60 * audioStream->getLength()) / 1000);
+ _vm->_audioMixer->adjustPan(channel, panEnd, (60u * audioStream->getLength()) / 1000u);
}
_tracks[track].isActive = true;
@@ -248,7 +248,9 @@ uint32 AudioPlayer::getLength(int track) const {
void AudioPlayer::stop(int track, bool immediately) {
if (isActive(track)) {
- _vm->_audioMixer->stop(_tracks[track].channel, immediately ? 0 : 60);
+ // If parameter "immediately" is not set,
+ // the delay for audio stop is 1 second (multiplied by 60u as expected by AudioMixer::stop())
+ _vm->_audioMixer->stop(_tracks[track].channel, immediately ? 0u : 60u);
}
}
diff --git a/engines/bladerunner/audio_player.h b/engines/bladerunner/audio_player.h
index bb516cd765..4e0e3fcf6a 100644
--- a/engines/bladerunner/audio_player.h
+++ b/engines/bladerunner/audio_player.h
@@ -73,8 +73,8 @@ public:
uint32 getLength(int track) const;
void stop(int track, bool immediately);
void stopAll();
- void adjustVolume(int track, int volume, uint32 delay, bool overrideVolume);
- void adjustPan(int track, int pan, uint32 delay);
+ void adjustVolume(int track, int volume, uint32 delaySeconds, bool overrideVolume);
+ void adjustPan(int track, int pan, uint32 delaySeconds);
void setVolume(int volume);
int getVolume() const;
diff --git a/engines/bladerunner/audio_speech.cpp b/engines/bladerunner/audio_speech.cpp
index f8129866f1..a181891a63 100644
--- a/engines/bladerunner/audio_speech.cpp
+++ b/engines/bladerunner/audio_speech.cpp
@@ -115,7 +115,7 @@ bool AudioSpeech::playSpeech(const Common::String &name, int pan) {
void AudioSpeech::stopSpeech() {
//Common::StackLock lock(_mutex);
if (_channel != -1) {
- _vm->_audioMixer->stop(_channel, 0);
+ _vm->_audioMixer->stop(_channel, 0u);
}
}
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index f5c0bf0670..343e31a048 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -2117,8 +2117,8 @@ void BladeRunnerEngine::playerDied() {
_gameFlags->reset(kFlagKIAPrivacyAddon);
_ambientSounds->removeAllNonLoopingSounds(true);
- _ambientSounds->removeAllLoopingSounds(4);
- _music->stop(4);
+ _ambientSounds->removeAllLoopingSounds(4u);
+ _music->stop(4u);
_audioSpeech->stopSpeech();
#endif // BLADERUNNER_ORIGINAL_BUGS
@@ -2223,9 +2223,9 @@ bool BladeRunnerEngine::loadGame(Common::SeekableReadStream &stream, int version
_music->stop(2);
#else
// loading into another game that also has music would
- // two music tracks to overlap and none was stopped
- _ambientSounds->removeAllLoopingSounds(0);
- _music->stop(0);
+ // cause two music tracks to overlap and none was stopped
+ _ambientSounds->removeAllLoopingSounds(0u);
+ _music->stop(0u);
#endif // BLADERUNNER_ORIGINAL_BUGS
_audioSpeech->stopSpeech();
_actorDialogueQueue->flush(true, false);
diff --git a/engines/bladerunner/movement_track.cpp b/engines/bladerunner/movement_track.cpp
index 5a458ae126..9ceee79dd9 100644
--- a/engines/bladerunner/movement_track.cpp
+++ b/engines/bladerunner/movement_track.cpp
@@ -47,17 +47,17 @@ void MovementTrack::reset() {
}
}
-int MovementTrack::append(int waypointId, int32 delay, bool run) {
- return append(waypointId, delay, -1, run);
+int MovementTrack::append(int waypointId, int32 delayMillis, bool run) {
+ return append(waypointId, delayMillis, -1, run);
}
-int MovementTrack::append(int waypointId, int32 delay, int angle, bool run) {
+int MovementTrack::append(int waypointId, int32 delayMillis, int angle, bool run) {
if (_lastIndex >= kSize) {
return 0;
}
_entries[_lastIndex].waypointId = waypointId;
- _entries[_lastIndex].delay = delay;
+ _entries[_lastIndex].delay = delayMillis;
_entries[_lastIndex].angle = angle;
_entries[_lastIndex].run = run;
@@ -92,16 +92,16 @@ bool MovementTrack::hasNext() const {
return _hasNext;
}
-bool MovementTrack::next(int *waypointId, int32 *delay, int *angle, bool *run) {
+bool MovementTrack::next(int *waypointId, int32 *delayMillis, int *angle, bool *run) {
if (_currentIndex < _lastIndex && _hasNext) {
*waypointId = _entries[_currentIndex].waypointId;
- *delay = _entries[_currentIndex].delay;
+ *delayMillis = _entries[_currentIndex].delay;
*angle = _entries[_currentIndex].angle;
*run = _entries[_currentIndex++].run;
return true;
} else {
*waypointId = -1;
- *delay = -1;
+ *delayMillis = -1;
*angle = -1;
*run = false;
_hasNext = false;
diff --git a/engines/bladerunner/movement_track.h b/engines/bladerunner/movement_track.h
index e13cd6f98c..e296e8a23b 100644
--- a/engines/bladerunner/movement_track.h
+++ b/engines/bladerunner/movement_track.h
@@ -51,15 +51,15 @@ class MovementTrack {
public:
MovementTrack();
~MovementTrack();
- int append(int waypointId, int32 delay, bool run);
- int append(int waypointId, int32 delay, int angle, bool run);
+ int append(int waypointId, int32 delayMillis, bool run);
+ int append(int waypointId, int32 delayMillis, int angle, bool run);
void flush();
void repeat();
void pause();
void unpause();
bool isPaused() const;
bool hasNext() const;
- bool next(int *waypointId, int32 *delay, int *angle, bool *run);
+ bool next(int *waypointId, int32 *delayMillis, int *angle, bool *run);
void save(SaveFileWriteStream &f);
void load(SaveFileReadStream &f);
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index badb47b55b..55cb9a88aa 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -172,7 +172,7 @@ bool AIScriptClovis::ShotAtAndHit() {
shotAnim();
Actor_Set_Targetable(kActorClovis, false);
ADQ_Add(kActorMcCoy, 2340, -1);
- Music_Stop(3);
+ Music_Stop(3u);
} else if (Actor_Query_Goal_Number(kActorClovis) == kGoalClovisKP07Wait
|| Actor_Query_Goal_Number(kActorClovis) == kGoalClovisKP07LayDown
) {
@@ -180,7 +180,7 @@ bool AIScriptClovis::ShotAtAndHit() {
Actor_Set_Goal_Number(kActorClovis, kGoalClovisGone);
shotAnim();
Actor_Set_Targetable(kActorClovis, false);
- Music_Stop(3);
+ Music_Stop(3u);
}
}
return false;
@@ -198,7 +198,7 @@ void AIScriptClovis::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
@@ -485,7 +485,7 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
#endif // BLADERUNNER_ORIGINAL_BUGS
Actor_Says(kActorClovis, 1310, kAnimationModeTalk);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeEnd4A, false, -1);
if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy
&& Game_Flag_Query(kFlagLucyIsReplicant)
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index a6bbac1471..f4d02b117b 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -346,7 +346,7 @@ void AIScriptDektora::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp
index ec26fe535a..e5d46e082a 100644
--- a/engines/bladerunner/script/ai/holloway.cpp
+++ b/engines/bladerunner/script/ai/holloway.cpp
@@ -171,7 +171,7 @@ bool AIScriptHolloway::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalHollowayCaptureMcCoy:
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Player_Gains_Control();
Outtake_Play(kOuttakeInterrogation, false, 1);
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index d1800a5556..bb74dd37be 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -301,7 +301,7 @@ void AIScriptIzo::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp
index 8f035879ba..c65fb00706 100644
--- a/engines/bladerunner/script/ai/lucy.cpp
+++ b/engines/bladerunner/script/ai/lucy.cpp
@@ -274,7 +274,7 @@ void AIScriptLucy::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
@@ -918,7 +918,7 @@ void AIScriptLucy::voightKampffTest() {
Actor_Says(kActorMcCoy, 6855, 13);
Actor_Says(kActorMcCoy, 6860, 13);
Actor_Says(kActorLucy, 1130, 14);
- Music_Stop(2);
+ Music_Stop(2u);
Player_Gains_Control();
Voight_Kampff_Activate(kActorLucy, 40);
diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp
index d16346d069..ccd675826f 100644
--- a/engines/bladerunner/script/ai/luther.cpp
+++ b/engines/bladerunner/script/ai/luther.cpp
@@ -91,7 +91,7 @@ bool AIScriptLuther::Update() {
Scene_Loop_Set_Default(5); // UG16MainLoopNoComputerLight
Scene_Loop_Start_Special(kSceneLoopModeOnce, 4, true); // UG16SparkLoop
Ambient_Sounds_Play_Sound(kSfxCOMPDWN4, 50, 0, 0, 99);
- Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, 1);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, 1u);
return false;
}
@@ -176,7 +176,7 @@ bool AIScriptLuther::ShotAtAndHit() {
}
Global_Variable_Increment(kVariableLutherLanceShot, 1);
- Music_Stop(2);
+ Music_Stop(2u);
if (Global_Variable_Query(kVariableLutherLanceShot) > 0) {
if (!Game_Flag_Query(kFlagLutherLanceIsReplicant)) {
@@ -203,7 +203,7 @@ void AIScriptLuther::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index 4925a89656..f12f62f4fd 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -575,7 +575,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Global_Variable_Set(kVariableChapter, 5);
Outtake_Play(kOuttakeMovieD, false, -1);
@@ -588,7 +588,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
return true;
case kGoalMcCoyArrested:
- Music_Stop(3);
+ Music_Stop(3u);
Player_Set_Combat_Mode(false);
Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
_animationState = 0;
diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp
index c436cfb314..c00970b8a3 100644
--- a/engines/bladerunner/script/ai/sadik.cpp
+++ b/engines/bladerunner/script/ai/sadik.cpp
@@ -246,7 +246,7 @@ void AIScriptSadik::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index f8a8674c88..00120ec3f9 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -329,7 +329,7 @@ void AIScriptSteele::CompletedMovementTrack() {
Player_Set_Combat_Mode(true);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP06toKP07);
Set_Enter(kSetKP07, kSceneKP07);
break;
@@ -1248,7 +1248,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 2);
Player_Set_Combat_Mode(false);
- Music_Stop(2);
+ Music_Stop(2u);
Player_Gains_Control();
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleTalkAboutMissingSpinner);
return true;
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index ab71d66407..c66a072554 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -129,14 +129,14 @@ void AIScriptZuben::TimerExpired(int timer) {
// return true;
} else if (timer == kActorTimerAIScriptCustomTask1) {
if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT02RunToFreeSlotG) { // Zuben fleeing, after 10s
- Music_Stop(10);
+ Music_Stop(10u);
Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT06HideAtFreeSlotA);
AI_Countdown_Timer_Reset(kActorZuben, kActorTimerAIScriptCustomTask1);
// return true;
}
} else if (timer == kActorTimerAIScriptCustomTask0) { // Zuben fleeing, after 70s
if (Player_Query_Current_Set() != kSetCT01_CT12) {
- Music_Stop(2);
+ Music_Stop(2u);
}
Actor_Set_Goal_Number(kActorZuben, kGoalZubenFled); // Let Zuben flee completly, he will catch McCoy on MA01
AI_Countdown_Timer_Reset(kActorZuben, kActorTimerAIScriptCustomTask0);
@@ -162,7 +162,7 @@ void AIScriptZuben::CompletedMovementTrack() {
Game_Flag_Reset(kFlagCT02McCoyFell);
Game_Flag_Set(kFlagCT02McCoyCombatReady);
Game_Flag_Set(kFlagCT02McCoyShouldCommentOnDumpedSoup);
- Music_Stop(2);
+ Music_Stop(2u);
Actor_Set_Goal_Number(kActorZuben, kGoalZubenFled);
Set_Enter(kSetCT02, kSceneCT02);
//return true;
@@ -171,7 +171,7 @@ void AIScriptZuben::CompletedMovementTrack() {
//return true;
} else {
if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT07RunToFreeSlotA) {
- Music_Stop(2);
+ Music_Stop(2u);
Sound_Play(kSfxDOORLOCK, 40, 100, 100, 50);
Delay(2000);
Game_Flag_Set(kFlagCT07toCT06);
@@ -281,7 +281,7 @@ bool AIScriptZuben::ShotAtAndHit() {
Actor_Start_Speech_Sample(kActorMcCoy, 490);
}
if (Player_Query_Current_Scene() == kSceneCT07) {
- Music_Stop(2);
+ Music_Stop(2u);
}
return false;
}
@@ -303,7 +303,7 @@ void AIScriptZuben::Retired(int byActorId) {
Player_Set_Combat_Mode(false);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP07toKP06);
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
Set_Enter(kSetKP05_KP06, kSceneKP06);
@@ -342,7 +342,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalZubenCT07Spared:
AI_Movement_Track_Flush(kActorZuben);
Actor_Face_Actor(kActorZuben, kActorMcCoy, true);
- Music_Stop(3);
+ Music_Stop(3u);
Actor_Says(kActorZuben, 100, 19);
Actor_Says(kActorMcCoy, 470, 12);
Actor_Says(kActorZuben, 110, 18);
@@ -456,7 +456,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Flush(kActorZuben);
#endif // BLADERUNNER_ORIGINAL_BUGS
Scene_Exits_Enable();
- Music_Stop(2);
+ Music_Stop(2u);
#if BLADERUNNER_ORIGINAL_BUGS
#else
Actor_Set_Goal_Number(kActorZuben, kGoalZubenDie);
diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp
index 39ec948cfc..d8ad59558f 100644
--- a/engines/bladerunner/script/scene/bb01.cpp
+++ b/engines/bladerunner/script/scene/bb01.cpp
@@ -68,10 +68,10 @@ void SceneScriptBB01::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxTHNDR1, 5, 120, 25, 33, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR2, 5, 120, 25, 33, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR3, 5, 120, 25, 33, -100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
if ( Game_Flag_Query(kFlagSpinnerAtBB01)
&& !Game_Flag_Query(kFlagDR02toBB01)
@@ -303,7 +303,7 @@ void SceneScriptBB01::PlayerWalkedIn() {
void SceneScriptBB01::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
#if BLADERUNNER_ORIGINAL_BUGS
#else
if (!Game_Flag_Query(kFlagBB01toBB02)
diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp
index 5541830f17..87edfd491b 100644
--- a/engines/bladerunner/script/scene/bb02.cpp
+++ b/engines/bladerunner/script/scene/bb02.cpp
@@ -100,7 +100,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 98.0f, -415.06f, -593.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB02toBB01);
Set_Enter(kSetBB01, kSceneBB01);
}
@@ -171,7 +171,7 @@ void SceneScriptBB02::PlayerWalkedOut() {
Actor_Set_Invisible(kActorMcCoy, false);
#endif // BLADERUNNER_ORIGINAL_BUGS
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptBB02::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/bb03.cpp b/engines/bladerunner/script/scene/bb03.cpp
index 9cb905bf53..30c4117319 100644
--- a/engines/bladerunner/script/scene/bb03.cpp
+++ b/engines/bladerunner/script/scene/bb03.cpp
@@ -90,7 +90,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, 0.0f, 0, false, false, false);
Game_Flag_Set(kFlagBB03toBB04);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB04);
}
return true;
@@ -100,7 +100,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 20.0f, 60.16f, 0.0f, 0, true, false, false)) {
Game_Flag_Set(kFlagBB03toBB02);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB02);
}
return true;
@@ -124,7 +124,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
}
Game_Flag_Set(kFlagBB03toBB05);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetBB05, kSceneBB05);
} else {
Actor_Says(kActorMcCoy, 8522, kAnimationModeTalk);
diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp
index 446be16da2..2002d9d3a5 100644
--- a/engines/bladerunner/script/scene/bb04.cpp
+++ b/engines/bladerunner/script/scene/bb04.cpp
@@ -88,7 +88,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) {
Player_Loses_Control();
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -15.0f, -25.17f, 45.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB04toBB02);
Game_Flag_Set(kFlagBB02ElevatorDown);
Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB02);
@@ -99,7 +99,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -107.0f, -26.6f, 397.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB04toBB03);
Set_Enter(kSetBB03, kSceneBB03);
}
diff --git a/engines/bladerunner/script/scene/bb05.cpp b/engines/bladerunner/script/scene/bb05.cpp
index ecf6897497..3b0b1b10b6 100644
--- a/engines/bladerunner/script/scene/bb05.cpp
+++ b/engines/bladerunner/script/scene/bb05.cpp
@@ -106,7 +106,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -212.0f, -60.31f, 131.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB05toBB03);
Set_Enter(kSetBB03, kSceneBB03);
}
@@ -116,7 +116,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 95.0f, -60.31f, 331.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB05toBB06);
Set_Enter(kSetBB06_BB07, kSceneBB06);
}
@@ -126,7 +126,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 271.0f, -60.31f, 203.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB05toBB07);
Set_Enter(kSetBB07, kSceneBB07);
}
@@ -136,7 +136,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
if (exitId == 3) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 151.0f, -60.34f, -108.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB05toBB12);
Set_Enter(kSetBB12, kSceneBB12);
}
diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp
index 048c63730a..b3509117cf 100644
--- a/engines/bladerunner/script/scene/bb06.cpp
+++ b/engines/bladerunner/script/scene/bb06.cpp
@@ -162,7 +162,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -37.0f, 0.0f, 178.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB06toBB05);
Set_Enter(kSetBB05, kSceneBB05);
}
@@ -172,7 +172,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 101.0f, 0.0f, -25.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB06toBB51);
Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB51);
}
@@ -182,7 +182,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
if (exitId == 3) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -115.0f, 0.0f, -103.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB06toBB07);
Set_Enter(kSetBB06_BB07, kSceneBB07);
}
diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp
index 0577948792..de300552db 100644
--- a/engines/bladerunner/script/scene/bb07.cpp
+++ b/engines/bladerunner/script/scene/bb07.cpp
@@ -116,7 +116,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -615.0f, 252.59f, -1018.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Overlay_Remove("BB07OVER");
Game_Flag_Set(kFlagBB07toBB05);
Set_Enter(kSetBB05, kSceneBB05);
@@ -127,7 +127,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -619.0f, 252.59f, -1136.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Overlay_Remove("BB07OVER");
Game_Flag_Set(kFlagBB07toBB12);
Set_Enter(kSetBB12, kSceneBB12);
@@ -138,7 +138,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -551.0f, 252.59f, -1004.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Overlay_Remove("BB07OVER");
Game_Flag_Set(kFlagBB07toBB06);
Set_Enter(kSetBB06_BB07, kSceneBB06);
diff --git a/engines/bladerunner/script/scene/bb08.cpp b/engines/bladerunner/script/scene/bb08.cpp
index 8b881524f5..69124f6ca9 100644
--- a/engines/bladerunner/script/scene/bb08.cpp
+++ b/engines/bladerunner/script/scene/bb08.cpp
@@ -93,7 +93,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) {
Loop_Actor_Travel_Ladder(kActorMcCoy, 8, true, kAnimationModeIdle);
Footstep_Sound_Override_Off();
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB08toBB09);
Set_Enter(kSetBB09, kSceneBB09);
}
@@ -103,7 +103,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 247.0f, 0.1f, 27.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB08toBB12);
Set_Enter(kSetBB12, kSceneBB12);
}
diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp
index 74ea3081d7..a051f71a46 100644
--- a/engines/bladerunner/script/scene/bb09.cpp
+++ b/engines/bladerunner/script/scene/bb09.cpp
@@ -112,7 +112,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 454.56f, -9.0f, 190.31f, 0, true, false, false)) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 450.56f, -9.0f, 250.31f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB09toBB10a);
Game_Flag_Set(kFlagBB09toBB10b);
Set_Enter(kSetBB10, kSceneBB10);
@@ -123,7 +123,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 71.0f, -9.0f, 136.0f, 72, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB09toBB08);
Set_Enter(kSetBB08, kSceneBB08);
}
diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp
index f8c57c1738..6b7e3ddea3 100644
--- a/engines/bladerunner/script/scene/bb10.cpp
+++ b/engines/bladerunner/script/scene/bb10.cpp
@@ -113,7 +113,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) {
Loop_Actor_Travel_Ladder(kActorMcCoy, 3, true, kAnimationModeIdle);
Footstep_Sound_Override_Off();
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB10toBB11);
Set_Enter(kSetBB11, kSceneBB11);
}
@@ -125,7 +125,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) {
&& !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 151.67f, 66.84f, -313.06f, 0, true, false, false)
) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Reset(kFlagBB09toBB10a);
Game_Flag_Set(kFlagBB10toBB09);
Set_Enter(kSetBB09, kSceneBB09);
diff --git a/engines/bladerunner/script/scene/bb12.cpp b/engines/bladerunner/script/scene/bb12.cpp
index b40be48a12..104b6a503c 100644
--- a/engines/bladerunner/script/scene/bb12.cpp
+++ b/engines/bladerunner/script/scene/bb12.cpp
@@ -85,7 +85,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -129.0f, 0.0f, 64.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB12toBB08);
Set_Enter(kSetBB08, kSceneBB08);
}
@@ -95,7 +95,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 138.0f, 0.0f, 104.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB12toBB07);
Set_Enter(kSetBB07, kSceneBB07);
}
@@ -105,7 +105,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 54.0f, 0.0f, 200.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB12toBB05);
Set_Enter(kSetBB05, kSceneBB05);
}
diff --git a/engines/bladerunner/script/scene/bb51.cpp b/engines/bladerunner/script/scene/bb51.cpp
index adf85d91fa..4b6945a470 100644
--- a/engines/bladerunner/script/scene/bb51.cpp
+++ b/engines/bladerunner/script/scene/bb51.cpp
@@ -102,7 +102,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 76.0f, 0.0f, 79.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB51toBB06a);
Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB06);
}
@@ -112,7 +112,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 55.0f, 0.0f, -96.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagBB51toBB06b);
Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB06);
}
diff --git a/engines/bladerunner/script/scene/ct03.cpp b/engines/bladerunner/script/scene/ct03.cpp
index e178499704..2497e19072 100644
--- a/engines/bladerunner/script/scene/ct03.cpp
+++ b/engines/bladerunner/script/scene/ct03.cpp
@@ -48,10 +48,10 @@ void SceneScriptCT03::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxDISH2, 3, 30, 8, 10, -100, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxDISH3, 3, 30, 8, 10, -100, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxDISH4, 3, 30, 8, 10, -100, 0, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxTHNDER3, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER4, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
}
@@ -123,7 +123,7 @@ void SceneScriptCT03::PlayerWalkedIn() {
void SceneScriptCT03::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptCT03::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp
index c5a5c3353e..fcc69fbed9 100644
--- a/engines/bladerunner/script/scene/ct04.cpp
+++ b/engines/bladerunner/script/scene/ct04.cpp
@@ -50,10 +50,10 @@ void SceneScriptCT04::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 34, 100, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxTHNDER3, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER4, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
}
@@ -193,7 +193,7 @@ bool SceneScriptCT04::ClickedOnActor(int actorId) {
Actor_Says(kActorMcCoy, 435, kAnimationModeTalk);
Actor_Set_Goal_Number(kActorTransient, kGoalTransientCT04Leave);
} else {
- Music_Stop(3);
+ Music_Stop(3u);
Actor_Says(kActorMcCoy, 425, kAnimationModeTalk);
Actor_Says(kActorTransient, 0, 13); // Hey, maybe spare some chinyen?
dialogueWithHomeless();
@@ -219,7 +219,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -82.86f, -621.3f, 769.03f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (Actor_Query_Goal_Number(kActorTransient) == kGoalTransientDefault) {
Actor_Set_Goal_Number(kActorTransient, kGoalTransientCT04Leave);
}
@@ -231,7 +231,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -187.0f, -621.3f, 437.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT04toCT03);
Set_Enter(kSetCT03_CT04, kSceneCT03);
}
@@ -241,7 +241,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -106.94f, -619.08f, 429.20f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT04toCT03);
Set_Enter(kSetCT03_CT04, kSceneCT03);
}
diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp
index d511ba9217..3c05bba859 100644
--- a/engines/bladerunner/script/scene/ct05.cpp
+++ b/engines/bladerunner/script/scene/ct05.cpp
@@ -243,7 +243,7 @@ void SceneScriptCT05::PlayerWalkedIn() {
void SceneScriptCT05::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptCT05::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index 594a7185bc..7afa47be56 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -42,10 +42,10 @@ void SceneScriptCT06::InitializeScene() {
}
Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2A, 80, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 50, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR2, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -119,7 +119,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 20.41f, -58.23f, -2.17f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT06toCT05);
Set_Enter(kSetCT05, kSceneCT05);
Game_Flag_Reset(kFlagNotUsed212);
@@ -145,7 +145,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) {
Actor_Says(kActorMcCoy, 8522, 12);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT06toCT08);
Set_Enter(kSetCT08_CT51_UG12, kSceneCT08);
Game_Flag_Reset(kFlagNotUsed212);
diff --git a/engines/bladerunner/script/scene/ct07.cpp b/engines/bladerunner/script/scene/ct07.cpp
index 69e3975f3b..c4a7ba1169 100644
--- a/engines/bladerunner/script/scene/ct07.cpp
+++ b/engines/bladerunner/script/scene/ct07.cpp
@@ -32,10 +32,10 @@ void SceneScriptCT07::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 30, 90, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 40, 100, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2A, 80, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 50, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR2, 10, 60, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -96,7 +96,7 @@ void SceneScriptCT07::PlayerWalkedIn() {
}
void SceneScriptCT07::PlayerWalkedOut() {
- Music_Stop(2);
+ Music_Stop(2u);
}
void SceneScriptCT07::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp
index 0de18aac46..91da414275 100644
--- a/engines/bladerunner/script/scene/ct08.cpp
+++ b/engines/bladerunner/script/scene/ct08.cpp
@@ -27,7 +27,7 @@ namespace BladeRunner {
void SceneScriptCT08::InitializeScene() {
if (Game_Flag_Query(kFlagChapter3Intro)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeMovieB1, false, -1);
if (Game_Flag_Query(kFlagLucyIsReplicant)) {
Outtake_Play(kOuttakeMovieB2, false, -1);
@@ -63,10 +63,10 @@ void SceneScriptCT08::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2A, 80, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 50, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR2, 5, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -129,7 +129,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -183.0f, 0.0f, 128.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT08toCT09);
Set_Enter(kSetCT09, kSceneCT09);
}
@@ -140,7 +140,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -11.0f, 0.0f, -156.0f, 0, true, false, false)) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, 0.0f, -102.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT08toCT51);
Set_Enter(kSetCT08_CT51_UG12, kSceneCT51);
}
@@ -150,7 +150,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -143.0f, 0.0f, -92.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT08toCT06);
Set_Enter(kSetCT06, kSceneCT06);
}
@@ -196,7 +196,7 @@ void SceneScriptCT08::PlayerWalkedIn() {
Game_Flag_Set(kFlagMcCoyInChinaTown);
// if player clicked through fast enough in BB roof encounter, the fight music would be (auto-)saved here
// and would be restored when loading the auto-save
- Music_Stop(0);
+ Music_Stop(0u);
#endif // BLADERUNNER_ORIGINAL_BUGS
Autosave_Game(1);
} else if (Game_Flag_Query(kFlagCT51toCT08)) {
diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp
index 7f312572ee..63a0fb0138 100644
--- a/engines/bladerunner/script/scene/ct09.cpp
+++ b/engines/bladerunner/script/scene/ct09.cpp
@@ -114,7 +114,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, 348.52f, 599.0f, 0, true, false, false)) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 348.52f, 599.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT09toCT08);
Set_Enter(kSetCT08_CT51_UG12, kSceneCT08);
}
@@ -124,7 +124,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 107.0f, 348.52f, 927.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT09toCT11);
Set_Enter(kSetCT11, kSceneCT11);
}
@@ -134,7 +134,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 159.0f, 349.0f, 570.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT09toCT10);
Set_Enter(kSetCT10, kSceneCT10);
}
diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp
index 2a577bf366..705ca29b96 100644
--- a/engines/bladerunner/script/scene/ct10.cpp
+++ b/engines/bladerunner/script/scene/ct10.cpp
@@ -128,7 +128,7 @@ bool SceneScriptCT10::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, 0.0f, -38.0f, 0, true, false, false)) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -121.0f, 0.0f, -78.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT10toCT09);
Set_Enter(kSetCT09, kSceneCT09);
}
diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp
index 1ac919ec52..ef33d84519 100644
--- a/engines/bladerunner/script/scene/ct11.cpp
+++ b/engines/bladerunner/script/scene/ct11.cpp
@@ -282,7 +282,7 @@ void SceneScriptCT11::PlayerWalkedIn() {
void SceneScriptCT11::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptCT11::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index ac8e705ea7..3f2db20a90 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -52,10 +52,10 @@ void SceneScriptCT12::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 33, 1, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBL1, 20, -100, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 20, -100, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 60, 180, 20, 33, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -189,7 +189,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.69f, -6.5f, 696.94f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT12toCT03);
Set_Enter(kSetCT03_CT04, kSceneCT03);
}
@@ -199,7 +199,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.13f, -6.5f, 1132.72f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT12toCT05);
Set_Enter(kSetCT05, kSceneCT05);
}
@@ -209,7 +209,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
if (exitId == 3) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -493.0f, -6.5f, 1174.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT12toCT11);
Set_Enter(kSetCT11, kSceneCT11);
}
@@ -222,7 +222,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
Game_Flag_Set(kFlagUnpauseGenWalkers);
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT12ToUG09);
Set_Enter(kSetUG09, kSceneUG09);
}
diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp
index fb516299cb..ea7bd7a58c 100644
--- a/engines/bladerunner/script/scene/ct51.cpp
+++ b/engines/bladerunner/script/scene/ct51.cpp
@@ -102,7 +102,7 @@ bool SceneScriptCT51::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, 0.0f, -102.0f, 0, true, false, false)) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -11.0f, 0.0f, -156.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagCT51toCT08);
Set_Enter(kSetCT08_CT51_UG12, kSceneCT08);
}
diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp
index 0469a8d6ab..59451ee48e 100644
--- a/engines/bladerunner/script/scene/dr01.cpp
+++ b/engines/bladerunner/script/scene/dr01.cpp
@@ -64,10 +64,10 @@ void SceneScriptDR01::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxHUMMER3, 12, 85, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxBIGFAN2, 14, 85, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2A, 5, 80, 16, 25, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN1A, 5, 80, 16, 25, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR1, 5, 80, 50, 100, -100, 100, -101, -101, 0, 0);
@@ -154,14 +154,14 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) {
} else {
Async_Actor_Walk_To_XYZ(kActorMcCoy, -911.0f, -0.04f, -118.0f, 0, false);
}
- Ambient_Sounds_Adjust_Looping_Sound(kSfxFACTAMB2, 10, -100, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxFACTAMB2, 10, -100, 1u);
Game_Flag_Set(kFlagDR01toDR02);
Set_Enter(kSetDR01_DR02_DR04, kSceneDR02);
}
} else {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -835.0f, -0.04f, -118.0f, 0, true, false, false)) {
Async_Actor_Walk_To_XYZ(kActorMcCoy, -911.0f, -0.04f, -118.0f, 0, false);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxFACTAMB2, 10, -100, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxFACTAMB2, 10, -100, 1u);
Game_Flag_Set(kFlagDR01toDR02);
Set_Enter(kSetDR01_DR02_DR04, kSceneDR02);
}
@@ -349,7 +349,7 @@ void SceneScriptDR01::PlayerWalkedOut() {
&& !Game_Flag_Query(kFlagDR01toCT11)
) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeInside2, true, -1);
#if BLADERUNNER_ORIGINAL_BUGS
#else
diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp
index 23387350cd..5a045e4c05 100644
--- a/engines/bladerunner/script/scene/dr02.cpp
+++ b/engines/bladerunner/script/scene/dr02.cpp
@@ -47,7 +47,7 @@ void SceneScriptDR02::InitializeScene() {
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(false);
- Ambient_Sounds_Remove_All_Looping_Sounds(0);
+ Ambient_Sounds_Remove_All_Looping_Sounds(0u);
Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxHUMMER3, 27, 85, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxBIGFAN2, 38, 85, 1);
@@ -151,8 +151,8 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) {
Game_Flag_Set(kFlagDR02toDR01);
Set_Enter(kSetDR01_DR02_DR04, kSceneDR01);
}
- Ambient_Sounds_Adjust_Looping_Sound(kSfxHUMMER3, 12, -101, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxBIGFAN2, 14, -101, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxHUMMER3, 12, -101, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxBIGFAN2, 14, -101, 1u);
return true;
}
@@ -169,8 +169,8 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) {
Game_Flag_Set(kFlagDR02toDR01);
Set_Enter(kSetDR01_DR02_DR04, kSceneDR01);
}
- Ambient_Sounds_Adjust_Looping_Sound(kSfxHUMMER3, 12, -101, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxBIGFAN2, 14, -101, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxHUMMER3, 12, -101, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxBIGFAN2, 14, -101, 1u);
return true;
}
diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp
index c272baded8..2b000bc327 100644
--- a/engines/bladerunner/script/scene/dr03.cpp
+++ b/engines/bladerunner/script/scene/dr03.cpp
@@ -42,7 +42,7 @@ void SceneScriptDR03::InitializeScene() {
Actor_Set_At_XYZ(kActorChew, 360.77f, 4.4f, -806.67f, 126);
}
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Ambient_Sounds_Add_Looping_Sound(kSfxRESPRTR1, 7, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxBRBED3, 50, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 20, 70, 1);
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index 7b9f355345..31018754e4 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -56,10 +56,10 @@ void SceneScriptDR04::InitializeScene() {
Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxFIREBD1, 55, -100, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxHUMMER1, 28, -100, 100);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2A, 40, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN1A, 40, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDR1, 5, 80, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -229,7 +229,7 @@ void SceneScriptDR04::SceneFrameAdvanced(int frame) {
Game_Flag_Reset(kFlagDR05BombWillExplode);
Scene_Loop_Set_Default(kDR04LoopMainPostExplosion);
Scene_Loop_Start_Special(kSceneLoopModeOnce, kDR04LoopDR04Explosion, true);
- Music_Stop(4);
+ Music_Stop(4u);
Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiPerished);
} else {
if (Game_Flag_Query(kFlagDR05BombWillExplode)) {
@@ -311,9 +311,9 @@ void SceneScriptDR04::PlayerWalkedIn() {
}
void SceneScriptDR04::PlayerWalkedOut() {
- Music_Stop(2);
+ Music_Stop(2u);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptDR04::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp
index 0d788ba124..681ec85a9a 100644
--- a/engines/bladerunner/script/scene/dr06.cpp
+++ b/engines/bladerunner/script/scene/dr06.cpp
@@ -85,7 +85,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
Game_Flag_Set(kFlagDR06JesterActive);
} else {
Overlay_Play("DR06over", 0, true, true, 0);
- Ambient_Sounds_Remove_Looping_Sound(kSfxJESTMOV1, 0);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxJESTMOV1, 0u);
Game_Flag_Reset(kFlagDR06JesterActive);
}
return true;
@@ -262,7 +262,7 @@ void SceneScriptDR06::PlayerWalkedIn() {
void SceneScriptDR06::PlayerWalkedOut() {
Overlay_Remove("DR06over");
Ambient_Sounds_Remove_All_Non_Looping_Sounds(false);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptDR06::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp
index c22346bc6d..972bb91292 100644
--- a/engines/bladerunner/script/scene/hc03.cpp
+++ b/engines/bladerunner/script/scene/hc03.cpp
@@ -166,7 +166,7 @@ bool SceneScriptHC03::ClickedOnExit(int exitId) {
Game_Flag_Reset(kFlagMcCoyInHawkersCircle);
Game_Flag_Set(kFlagMcCoyInUnderground);
Game_Flag_Set(kFlagHC03TrapDoorOpen);
- Music_Stop(2);
+ Music_Stop(2u);
Set_Enter(kSetUG02, kSceneUG02);
}
}
@@ -215,7 +215,7 @@ void SceneScriptHC03::PlayerWalkedIn() {
void SceneScriptHC03::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptHC03::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index d7e552350d..be3038590e 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -404,7 +404,7 @@ void SceneScriptHF01::PlayerWalkedIn() {
void SceneScriptHF01::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (!Game_Flag_Query(kFlagHF01toHF05)
&& !Game_Flag_Query(kFlagHF01toHF02)
diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp
index d96288ce38..90feae75ee 100644
--- a/engines/bladerunner/script/scene/hf02.cpp
+++ b/engines/bladerunner/script/scene/hf02.cpp
@@ -88,7 +88,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHF02toHF01);
Set_Enter(kSetHF01, kSceneHF01);
}
@@ -98,7 +98,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHF02toHF03);
Set_Enter(kSetHF03, kSceneHF03);
}
diff --git a/engines/bladerunner/script/scene/hf03.cpp b/engines/bladerunner/script/scene/hf03.cpp
index f4bd11e2ea..ee1e94b0f7 100644
--- a/engines/bladerunner/script/scene/hf03.cpp
+++ b/engines/bladerunner/script/scene/hf03.cpp
@@ -265,7 +265,7 @@ void SceneScriptHF03::PlayerWalkedIn() {
void SceneScriptHF03::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptHF03::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/hf07.cpp b/engines/bladerunner/script/scene/hf07.cpp
index 4d950ca9a4..dc991a413e 100644
--- a/engines/bladerunner/script/scene/hf07.cpp
+++ b/engines/bladerunner/script/scene/hf07.cpp
@@ -86,7 +86,7 @@ bool SceneScriptHF07::ClickedOnExit(int exitId) {
Footstep_Sound_Override_Off();
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetHF05, kSceneHF05);
}
return true;
@@ -101,7 +101,7 @@ bool SceneScriptHF07::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -84.0f, 58.43f, -105.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagHF07toUG06);
Set_Enter(kSetUG05, kSceneUG05);
}
diff --git a/engines/bladerunner/script/scene/kp01.cpp b/engines/bladerunner/script/scene/kp01.cpp
index bb21551e4c..4f941e94f9 100644
--- a/engines/bladerunner/script/scene/kp01.cpp
+++ b/engines/bladerunner/script/scene/kp01.cpp
@@ -85,7 +85,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -125.0f, -12.2f, -61.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP01toKP04);
Set_Enter(kSetKP04, kSceneKP04);
}
@@ -95,7 +95,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -284.0f, -12.2f, -789.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP01toKP03);
Set_Enter(kSetKP03, kSceneKP03);
}
@@ -105,7 +105,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 239.0f, 12.2f, -146.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP01toKP02);
Set_Enter(kSetKP02, kSceneKP02);
}
@@ -140,7 +140,7 @@ void SceneScriptKP01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
Player_Gains_Control();
Actor_Force_Stop_Walking(kActorMcCoy);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP01toKP03);
Set_Enter(kSetKP03, kSceneKP03);
//return true;
diff --git a/engines/bladerunner/script/scene/kp02.cpp b/engines/bladerunner/script/scene/kp02.cpp
index 5bb0474deb..012902fca1 100644
--- a/engines/bladerunner/script/scene/kp02.cpp
+++ b/engines/bladerunner/script/scene/kp02.cpp
@@ -89,12 +89,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) {
Actor_Set_Goal_Number(kActorFreeSlotB, kGoalFreeSlotBAct5Default);
Actor_Set_Goal_Number(kActorFreeSlotA, kGoalFreeSlotAAct5Default);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP02toUG12);
Set_Enter(kSetUG12, kSceneUG12);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP02toUG12);
Set_Enter(kSetUG12, kSceneUG12);
}
@@ -112,12 +112,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) {
Actor_Set_Goal_Number(kActorFreeSlotB, kGoalFreeSlotBAct5Default);
Actor_Set_Goal_Number(kActorFreeSlotA, kGoalFreeSlotAAct5Default);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP02toKP01);
Set_Enter(kSetKP01, kSceneKP01);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP02toKP01);
Set_Enter(kSetKP01, kSceneKP01);
}
diff --git a/engines/bladerunner/script/scene/kp04.cpp b/engines/bladerunner/script/scene/kp04.cpp
index daaad96515..e587eba564 100644
--- a/engines/bladerunner/script/scene/kp04.cpp
+++ b/engines/bladerunner/script/scene/kp04.cpp
@@ -73,7 +73,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -905.0f, 94.89f, 1357.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP04toKP01);
Set_Enter(kSetKP01, kSceneKP01);
}
@@ -83,7 +83,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -544.0f, 94.89f, 288.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP04toKP05);
Set_Enter(kSetKP05_KP06, kSceneKP05);
}
diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp
index f04e1a2c93..fadc087e2c 100644
--- a/engines/bladerunner/script/scene/kp05.cpp
+++ b/engines/bladerunner/script/scene/kp05.cpp
@@ -91,7 +91,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -802.0f, 0.0f, 972.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP05toKP03);
Set_Enter(kSetKP03, kSceneKP03);
}
@@ -101,7 +101,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1142.0f, 0.0f, 932.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP05toKP04);
Set_Enter(kSetKP04, kSceneKP04);
}
@@ -111,7 +111,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -68.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP05toKP06);
Async_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -216.0f, 0, false);
Set_Enter(kSetKP05_KP06, kSceneKP06);
diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp
index d8e7299350..f73c1a22b6 100644
--- a/engines/bladerunner/script/scene/kp06.cpp
+++ b/engines/bladerunner/script/scene/kp06.cpp
@@ -104,7 +104,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 8.26f, -68.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP06toKP05);
Set_Enter(kSetKP05_KP06, kSceneKP05);
}
@@ -126,7 +126,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) {
Actor_Set_Goal_Number(kActorGaff, kGoalGaffGone);
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP06toKP07);
Set_Enter(kSetKP07, kSceneKP07);
}
@@ -137,7 +137,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, false, true, false);
Player_Set_Combat_Mode(false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagKP06toKP07);
Set_Enter(kSetKP07, kSceneKP07);
} else {
@@ -186,7 +186,7 @@ void SceneScriptKP06::PlayerWalkedIn() {
Actor_Says(kActorMcCoy, 6220, -1);
Delay(3000);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeEnd6, false, -1);
Game_Over();
} else { // Ending - talk with Gaff and leaving alone
@@ -223,7 +223,7 @@ void SceneScriptKP06::PlayerWalkedIn() {
// but do it after the cutscene,
// since this particular cutscene has no sound
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
#endif // BLADERUNNER_ORIGINAL_BUGS
Game_Over();
}
diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp
index e818218eb9..a94a8f873d 100644
--- a/engines/bladerunner/script/scene/ma01.cpp
+++ b/engines/bladerunner/script/scene/ma01.cpp
@@ -113,7 +113,7 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) {
}
} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1446.0f, 0.0f, -725.0f, 12, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagMA01toMA06);
Set_Enter(kSetMA06, kSceneMA06);
}
@@ -298,7 +298,7 @@ void SceneScriptMA01::PlayerWalkedIn() {
void SceneScriptMA01::PlayerWalkedOut() {
Actor_Set_Invisible(kActorMcCoy, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (_vm->_cutContent) {
ADQ_Flush(); // for dispatcher queue cleanup
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp
index 3760df59e2..6dc69626fe 100644
--- a/engines/bladerunner/script/scene/ma06.cpp
+++ b/engines/bladerunner/script/scene/ma06.cpp
@@ -37,7 +37,7 @@ void SceneScriptMA06::InitializeScene() {
#if BLADERUNNER_ORIGINAL_BUGS
#else
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
#endif // BLADERUNNER_ORIGINAL_BUGS
@@ -123,8 +123,8 @@ void SceneScriptMA06::PlayerWalkedIn() {
Game_Flag_Reset(kFlagMA06toMA01);
Game_Flag_Reset(kFlagMA06ToMA02);
Game_Flag_Reset(kFlagMA06toMA07);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 10, 0, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 10, 0, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 10, 0, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 10, 0, 1u);
Actor_Says(kActorAnsweringMachine, 80, 3); // your floor number please
Actor_Says(kActorMcCoy, 2940, 18); // McCoy: McCoy 88F
@@ -140,12 +140,12 @@ void SceneScriptMA06::PlayerWalkedIn() {
Game_Flag_Reset(kFlagMA01toMA06);
Game_Flag_Reset(kFlagMA02toMA06);
Game_Flag_Reset(kFlagMA07toMA06);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxSPINUP1, 0, 0, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 0, 0, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 0, 0, 1);
- Ambient_Sounds_Remove_Looping_Sound(kSfxSPINUP1, 1); // stop elev moving sound
- Ambient_Sounds_Remove_Looping_Sound(kSfxAPRTFAN1, 1); // stop other ambient
- Ambient_Sounds_Remove_Looping_Sound(kSfxELEAMB3, 1); // stop other ambient
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxSPINUP1, 0, 0, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 0, 0, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 0, 0, 1u);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxSPINUP1, 1u); // stop elev moving sound
+ Ambient_Sounds_Remove_Looping_Sound(kSfxAPRTFAN1, 1u); // stop other ambient
+ Ambient_Sounds_Remove_Looping_Sound(kSfxELEAMB3, 1u); // stop other ambient
Actor_Says_With_Pause(kActorRachael, 300, 1.0f, 14); // GoodbyeMcCoy
Actor_Says(kActorRachael, 310, 14); // Isnt ThisYourFloor --
Actor_Says(kActorMcCoy, 2860, 14); // YouTakeCareOfYoursel
@@ -165,8 +165,8 @@ void SceneScriptMA06::PlayerWalkedIn() {
Game_Flag_Reset(kFlagMA06toMA01);
Game_Flag_Reset(kFlagMA06ToMA02);
Game_Flag_Reset(kFlagMA06toMA07);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 10, 0, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 10, 0, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 10, 0, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 10, 0, 1u);
Actor_Says(kActorAnsweringMachine, 80, 3); // your floor number please
Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsInsideElevatorStartTalkAct4);
@@ -175,12 +175,12 @@ void SceneScriptMA06::PlayerWalkedIn() {
Game_Flag_Reset(kFlagMA01toMA06);
Game_Flag_Reset(kFlagMA02toMA06);
Game_Flag_Reset(kFlagMA07toMA06);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxSPINUP1, 0, 0, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 0, 0, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 0, 0, 1);
- Ambient_Sounds_Remove_Looping_Sound(kSfxSPINUP1, 1); // stop elev moving sound
- Ambient_Sounds_Remove_Looping_Sound(kSfxAPRTFAN1, 1); // stop other ambient
- Ambient_Sounds_Remove_Looping_Sound(kSfxELEAMB3, 1); // stop other ambient
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxSPINUP1, 0, 0, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 0, 0, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 0, 0, 1u);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxSPINUP1, 1u); // stop elev moving sound
+ Ambient_Sounds_Remove_Looping_Sound(kSfxAPRTFAN1, 1u); // stop other ambient
+ Ambient_Sounds_Remove_Looping_Sound(kSfxELEAMB3, 1u); // stop other ambient
// Player_Gains_Control();
Set_Enter(kSetMA07, kSceneMA07);
@@ -219,7 +219,7 @@ void SceneScriptMA06::PlayerWalkedIn() {
void SceneScriptMA06::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Player_Gains_Control();
if (_vm->_cutContent) {
if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsInsideElevatorStartTalkAct3) {
diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp
index c42c1c6f32..1a11279503 100644
--- a/engines/bladerunner/script/scene/ma07.cpp
+++ b/engines/bladerunner/script/scene/ma07.cpp
@@ -86,7 +86,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) {
Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyStartChapter5);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagMA07toMA06);
Set_Enter(kSetMA06, kSceneMA06);
}
@@ -97,7 +97,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, -162.8f, 185.08f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagMA07toPS14);
Game_Flag_Reset(kFlagMcCoyInMcCoyApartment);
Game_Flag_Set(kFlagMcCoyInPoliceStation);
@@ -109,7 +109,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 8.0f, -172.43f, 356.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagMA07toUG19);
Set_Enter(kSetUG19, kSceneUG19);
}
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index db86122379..522bd4d88f 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -137,7 +137,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
Actor_Says(kActorMcCoy, 8522, 12);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR01toNR03);
Set_Enter(kSetNR03, kSceneNR03);
}
@@ -150,7 +150,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
Actor_Face_Heading(kActorMcCoy, 45, false);
Loop_Actor_Travel_Stairs(kActorMcCoy, 3, false, kAnimationModeIdle);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR01toUG06);
Set_Enter(kSetUG06, kSceneUG06);
}
@@ -160,7 +160,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
if (exitId == 2) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 312.0f, 31.66f, -901.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR01toNR02);
Set_Enter(kSetNR02, kSceneNR02);
}
@@ -462,7 +462,7 @@ void SceneScriptNR01::PlayerWalkedIn() {
void SceneScriptNR01::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (!Game_Flag_Query(kFlagNR01toUG06)
&& !Game_Flag_Query(kFlagNR01toNR02)
&& !Game_Flag_Query(kFlagNR01toNR03)
diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp
index 98a54f9c74..fac0bced1c 100644
--- a/engines/bladerunner/script/scene/nr07.cpp
+++ b/engines/bladerunner/script/scene/nr07.cpp
@@ -138,7 +138,7 @@ bool SceneScriptNR07::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -102.0f, -73.5f, -233.0f, 0, true, false, false)) {
Actor_Set_Goal_Number(kActorHanoi, kGoalHanoiResetTimer);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagNR07toNR06);
Set_Enter(kSetNR06, kSceneNR06);
}
diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp
index 778f19d33c..859adbe904 100644
--- a/engines/bladerunner/script/scene/nr10.cpp
+++ b/engines/bladerunner/script/scene/nr10.cpp
@@ -55,7 +55,7 @@ void SceneScriptNR10::InitializeScene() {
if (Game_Flag_Query(kFlagNR10CameraDestroyed)) {
Scene_Loop_Set_Default(0);
} else {
- Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 31, 0, 1);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 31, 0, 1u);
Scene_Loop_Set_Default(2);
}
}
@@ -81,7 +81,7 @@ bool SceneScriptNR10::ClickedOn3DObject(const char *objectName, bool combatMode)
Game_Flag_Reset(kFlagNR10McCoyBlinded);
Actor_Set_Invisible(kActorMcCoy, false);
Actor_Set_Invisible(kActorDektora, false);
- Ambient_Sounds_Remove_Looping_Sound(kSfx35MM, 1);
+ Ambient_Sounds_Remove_Looping_Sound(kSfx35MM, 1u);
Sound_Play(kSfx35MMBRK1, 52, 0, 0, 50);
Scene_Loop_Set_Default(0);
Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, true);
diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp
index abe4a07760..440ec96063 100644
--- a/engines/bladerunner/script/scene/ps01.cpp
+++ b/engines/bladerunner/script/scene/ps01.cpp
@@ -315,7 +315,7 @@ void SceneScriptPS01::PlayerWalkedIn() {
void SceneScriptPS01::PlayerWalkedOut() {
Actor_Set_Invisible(kActorMcCoy, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (_vm->_cutContent) {
ADQ_Flush(); // for dispatcher queue cleanup
diff --git a/engines/bladerunner/script/scene/ps02.cpp b/engines/bladerunner/script/scene/ps02.cpp
index c8ff284f0d..91c090bcf2 100644
--- a/engines/bladerunner/script/scene/ps02.cpp
+++ b/engines/bladerunner/script/scene/ps02.cpp
@@ -65,35 +65,35 @@ bool SceneScriptPS02::ClickedOn3DObject(const char *objectName, bool a2) {
if (Game_Flag_Query(kFlagPS02toPS01)) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS01, kScenePS01);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true);
}
} else if (Game_Flag_Query(kFlagPS02toPS05)) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS05, kScenePS05);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true);
}
} else if (Game_Flag_Query(kFlagPS02toPS07)) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS07, kScenePS07);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true);
}
} else if (Game_Flag_Query(kFlagPS02toPS03)) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS03, kScenePS03);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true);
}
} else if (Game_Flag_Query(kFlagPS02toPS09)) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS09, kScenePS09);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true);
}
@@ -160,7 +160,7 @@ void SceneScriptPS02::PlayerWalkedIn() {
void SceneScriptPS02::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Player_Gains_Control();
}
diff --git a/engines/bladerunner/script/scene/ps03.cpp b/engines/bladerunner/script/scene/ps03.cpp
index d4769023d5..ca6502f12a 100644
--- a/engines/bladerunner/script/scene/ps03.cpp
+++ b/engines/bladerunner/script/scene/ps03.cpp
@@ -79,7 +79,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -674.0f, -354.0f, 550.0f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS03toPS04);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS04, kScenePS04);
}
#else
@@ -87,7 +87,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -674.0f, -354.0f, 690.0f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS03toPS04);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS04, kScenePS04);
}
#endif // BLADERUNNER_ORIGINAL_BUGS
@@ -96,7 +96,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -569.54f, -354.62f, -1076.15f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS02, kScenePS02);
Game_Flag_Reset(kFlagMcCoyAtPS03);
if (Global_Variable_Query(kVariableChapter) < 4) {
@@ -110,7 +110,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -875.0f, -354.0f, -1241.0f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS03toPS14);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS14, kScenePS14);
}
#else
@@ -118,7 +118,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -875.0f, -354.0f, -1231.0f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS03toPS14);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS14, kScenePS14);
}
#endif // BLADERUNNER_ORIGINAL_BUGS
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp
index b22efc1e5b..9582fd0c98 100644
--- a/engines/bladerunner/script/scene/ps04.cpp
+++ b/engines/bladerunner/script/scene/ps04.cpp
@@ -133,7 +133,7 @@ bool SceneScriptPS04::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -668.0f, -350.85f, 962.0f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS04toPS03);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS03, kScenePS03);
}
return true;
diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp
index fb5c30b083..241eef2554 100644
--- a/engines/bladerunner/script/scene/ps05.cpp
+++ b/engines/bladerunner/script/scene/ps05.cpp
@@ -112,7 +112,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 2, 24, true, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS15, kScenePS15);
}
return true;
@@ -120,7 +120,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 635.0f, 0.0f, -598.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS02, kScenePS02);
}
return true;
@@ -130,14 +130,14 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 742.52f, 0.37f, -457.69f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS05toPS06);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS06, kScenePS06);
}
#else
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 715.52f, 0.37f, -457.69f, 0, true, false, false)) {
Game_Flag_Set(kFlagPS05toPS06);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS06, kScenePS06);
}
#endif // BLADERUNNER_ORIGINAL_BUGS
diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp
index 4205569760..20f861b98e 100644
--- a/engines/bladerunner/script/scene/ps06.cpp
+++ b/engines/bladerunner/script/scene/ps06.cpp
@@ -140,7 +140,7 @@ bool SceneScriptPS06::ClickedOnExit(int exitId) {
if (exitId == 0) {
Game_Flag_Set(kFlagPS06toPS05);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS05, kScenePS05);
return true;
}
diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index a7f84132b4..c1852a7a0a 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -232,7 +232,7 @@ bool SceneScriptPS09::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -559.15f, 0.0f, -85.06f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS02, kScenePS02);
Game_Flag_Reset(kFlagPS09Entered);
}
diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp
index afcc6808de..13d14d27e9 100644
--- a/engines/bladerunner/script/scene/ps13.cpp
+++ b/engines/bladerunner/script/scene/ps13.cpp
@@ -767,7 +767,7 @@ bool SceneScriptPS13::ClickedOnExit(int exitId) {
Game_Flag_Set(kFlagPS13toPS05);
Player_Set_Combat_Mode(false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
removeTargets();
// Global_Variable_Decrement(kVariablePoliceMazeScore, kPoliceMazePS13TargetCount - Global_Variable_Query(kVariablePoliceMazePS13TargetCounter));
Police_Maze_Decrement_Score(kPoliceMazePS13TargetCount - Global_Variable_Query(kVariablePoliceMazePS13TargetCounter));
diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp
index df00cee38f..8df2f6bde5 100644
--- a/engines/bladerunner/script/scene/ps15.cpp
+++ b/engines/bladerunner/script/scene/ps15.cpp
@@ -177,7 +177,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -360.0f, -113.43f, 50.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagPS15toPS05);
Set_Enter(kSetPS05, kScenePS05);
}
@@ -195,7 +195,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) {
Sound_Play(kSfxLABBUZZ1, 90, 0, 0, 50);
#endif // BLADERUNNER_ORIGINAL_BUGS
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetPS10_PS11_PS12_PS13, kScenePS10);
}
return true;
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index a54e9ef2e1..644ca3be8f 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -49,7 +49,7 @@ enum kRC01Regions {
void SceneScriptRC01::InitializeScene() {
if (!Game_Flag_Query(kFlagIntroPlayed)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeWestwood, true, -1);
Outtake_Play(kOuttakeBladeRunner, true, -1);
Outtake_Play(kOuttakeIntro, false, -1);
@@ -632,7 +632,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -471.98f, -0.3f, 258.15f, 4, true, false, false)) {
Game_Flag_Set(kFlagRC01toRC03);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Set_Enter(kSetRC03, kSceneRC03);
}
return true;
@@ -740,7 +740,7 @@ void SceneScriptRC01::PlayerWalkedIn() {
void SceneScriptRC01::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (!Game_Flag_Query(kFlagRC01toRC02)
&& !Game_Flag_Query(kFlagRC01toRC03)
) {
diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp
index 426a3ce760..7532a794eb 100644
--- a/engines/bladerunner/script/scene/rc02.cpp
+++ b/engines/bladerunner/script/scene/rc02.cpp
@@ -54,12 +54,12 @@ void SceneScriptRC02::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxPETDEAD3, 5, 40, 6, 6, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxPETDEAD4, 5, 40, 6, 6, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxPETDEAD5, 5, 40, 6, 6, -100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 10u, 60u, 5, 5, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 10u, 60u, 5, 5, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 10u, 60u, 5, 5, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 10u, 60u, 5, 5, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 10u, 60u, 5, 5, 100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 10u, 60u, 5, 5, 100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSIREN2, 20, 80, 10, 20, 100, 100, -101, -101, 0, 0);
}
@@ -456,9 +456,9 @@ bool SceneScriptRC02::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -71.51f, -1238.89f, 108587.15f, 0, true, false, false)) {
Game_Flag_Set(kFlagRC02toRC01);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_Looping_Sound(kSfxBRBED5, 1);
- Ambient_Sounds_Remove_Looping_Sound(kSfxWINDLOP8, 1);
- Ambient_Sounds_Adjust_Looping_Sound(kSfxRCRAIN1, 100, -101, 1);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxBRBED5, 1u);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxWINDLOP8, 1u);
+ Ambient_Sounds_Adjust_Looping_Sound(kSfxRCRAIN1, 100, -101, 1u);
Actor_Set_Goal_Number(kActorRunciter, kGoalRunciterDefault);
Set_Enter(kSetRC01, kSceneRC01);
}
diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp
index e173901fdb..b868b8149b 100644
--- a/engines/bladerunner/script/scene/rc03.cpp
+++ b/engines/bladerunner/script/scene/rc03.cpp
@@ -65,10 +65,10 @@ void SceneScriptRC03::InitializeScene() {
Ambient_Sounds_Add_Sound(kSfxRCCARBY1, 5, 30, 40, 70, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxRCCARBY2, 5, 30, 40, 75, -100, 100, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxRCCARBY3, 5, 30, 40, 70, -100, 100, -101, -101, 0, 0);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
- Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
+ Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0);
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -396,7 +396,7 @@ void SceneScriptRC03::PlayerWalkedOut() {
Actor_Set_Goal_Number(kActorIzo, kGoalIzoDieHidden);
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptRC03::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/tb03.cpp b/engines/bladerunner/script/scene/tb03.cpp
index cb1964395f..0f7d7e852e 100644
--- a/engines/bladerunner/script/scene/tb03.cpp
+++ b/engines/bladerunner/script/scene/tb03.cpp
@@ -110,7 +110,7 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -260.0f, 0.15f, 2014.0f, 0, true, false, false)) {
Actor_Set_Goal_Number(kActorTyrellGuard, kGoalTyrellGuardWait);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagTB03toUG17);
Set_Enter(kSetUG17, kSceneUG17);
}
@@ -120,7 +120,7 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagTB03toTB02);
Set_Enter(kSetTB02_TB03, kSceneTB02);
Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false);
@@ -151,7 +151,7 @@ void SceneScriptTB03::PlayerWalkedIn() {
}
void SceneScriptTB03::PlayerWalkedOut() {
- Music_Stop(2);
+ Music_Stop(2u);
}
void SceneScriptTB03::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp
index 70f61ddd5b..a3692f0fdf 100644
--- a/engines/bladerunner/script/scene/tb05.cpp
+++ b/engines/bladerunner/script/scene/tb05.cpp
@@ -236,7 +236,7 @@ void SceneScriptTB05::PlayerWalkedIn() {
void SceneScriptTB05::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptTB05::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp
index 545f17b6bc..55e2b24fbc 100644
--- a/engines/bladerunner/script/scene/tb06.cpp
+++ b/engines/bladerunner/script/scene/tb06.cpp
@@ -220,7 +220,7 @@ void SceneScriptTB06::PlayerWalkedIn() {
void SceneScriptTB06::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptTB06::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp
index 1a9d172890..ac6b492ebd 100644
--- a/engines/bladerunner/script/scene/tb07.cpp
+++ b/engines/bladerunner/script/scene/tb07.cpp
@@ -96,7 +96,7 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 68.0f, 12.0f, 288.0f, 0, true, false, false)) {
#if BLADERUNNER_ORIGINAL_BUGS
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
#endif // BLADERUNNER_ORIGINAL_BUGS
if (Global_Variable_Query(kVariableChapter) == 4) {
Game_Flag_Set(kFlagTB07toTB02);
@@ -208,7 +208,7 @@ void SceneScriptTB07::PlayerWalkedOut() {
#if BLADERUNNER_ORIGINAL_BUGS
#else
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (Global_Variable_Query(kVariableChapter) < 4
&& !Game_Flag_Query(kFlagMcCoyInTyrellBuilding)
) {
diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp
index cdb0e31985..929c4acd87 100644
--- a/engines/bladerunner/script/scene/ug02.cpp
+++ b/engines/bladerunner/script/scene/ug02.cpp
@@ -250,7 +250,7 @@ void SceneScriptUG02::PlayerWalkedIn() {
void SceneScriptUG02::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptUG02::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ug03.cpp b/engines/bladerunner/script/scene/ug03.cpp
index ed3c0d5699..dca4ef51f0 100644
--- a/engines/bladerunner/script/scene/ug03.cpp
+++ b/engines/bladerunner/script/scene/ug03.cpp
@@ -133,7 +133,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) {
Actor_Says(kActorMcCoy, 8522, 14);
} else {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG03toUG10);
Set_Enter(kSetUG10, kSceneUG10);
}
@@ -144,7 +144,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -51.0f, 0.0f, 255.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG03toUG04);
Set_Enter(kSetUG04, kSceneUG04);
}
diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp
index b126ba4bb6..3bcb3d3256 100644
--- a/engines/bladerunner/script/scene/ug04.cpp
+++ b/engines/bladerunner/script/scene/ug04.cpp
@@ -189,7 +189,7 @@ void SceneScriptUG04::PlayerWalkedIn() {
void SceneScriptUG04::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptUG04::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ug05.cpp b/engines/bladerunner/script/scene/ug05.cpp
index c8951625aa..fcfc8a8921 100644
--- a/engines/bladerunner/script/scene/ug05.cpp
+++ b/engines/bladerunner/script/scene/ug05.cpp
@@ -188,7 +188,7 @@ void SceneScriptUG05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
void SceneScriptUG05::PlayerWalkedIn() {
if (Game_Flag_Query(kFlagHF05PoliceArrived)) {
if (Game_Flag_Query(kFlagHF07Hole)) {
- Music_Stop(2);
+ Music_Stop(2u);
Actor_Put_In_Set(kActorOfficerGrayford, kSetUG05);
Actor_Set_At_XYZ(kActorOfficerGrayford, 4.22f, -1.37f, -925.0f, 750);
@@ -238,7 +238,7 @@ void SceneScriptUG05::PlayerWalkedIn() {
void SceneScriptUG05::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptUG05::DialogueQueueFlushed(int a1) {
@@ -272,7 +272,7 @@ void SceneScriptUG05::endGame() {
}
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (affectionTowardsActor == kActorLucy) {
if (!Game_Flag_Query(kFlagLucyIsReplicant)) {
diff --git a/engines/bladerunner/script/scene/ug06.cpp b/engines/bladerunner/script/scene/ug06.cpp
index b0624f5747..d849175b64 100644
--- a/engines/bladerunner/script/scene/ug06.cpp
+++ b/engines/bladerunner/script/scene/ug06.cpp
@@ -27,7 +27,7 @@ namespace BladeRunner {
void SceneScriptUG06::InitializeScene() {
if (Game_Flag_Query(kFlagChapter4Intro)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Outtake_Play(kOuttakeMovieC1, false, -1);
if (Game_Flag_Query(kFlagLutherLanceIsReplicant)) {
Outtake_Play(kOuttakeMovieC3, false, -1);
@@ -95,7 +95,7 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.0f, 0.0f, 321.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG06toUG04);
Set_Enter(kSetUG04, kSceneUG04);
}
@@ -108,7 +108,7 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) {
Loop_Actor_Travel_Stairs(kActorMcCoy, 17, true, kAnimationModeIdle);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 66.0f, 153.0f, -446.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG06toNR01);
Set_Enter(kSetNR01, kSceneNR01);
}
diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp
index 7a4c1d8146..9e98cf501d 100644
--- a/engines/bladerunner/script/scene/ug07.cpp
+++ b/engines/bladerunner/script/scene/ug07.cpp
@@ -98,7 +98,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -94.0f, -12.21f, -710.0f, 0, true, false, false) && Actor_Query_Goal_Number(kActorClovis) != kGoalClovisUG07KillMcCoy) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG07toUG09);
Set_Enter(kSetUG09, kSceneUG09);
return true;
@@ -108,7 +108,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 110.0f, -12.21f, -274.0f, 0, true, false, false) && Actor_Query_Goal_Number(kActorClovis) != kGoalClovisUG07KillMcCoy) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG07toUG08);
Set_Enter(kSetUG08, kSceneUG08);
return true;
@@ -154,7 +154,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) {
&& Actor_Query_Goal_Number(kActorClovis) != kGoalClovisUG07KillMcCoy
) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG07toUG10);
Set_Enter(kSetUG10, kSceneUG10);
return true;
diff --git a/engines/bladerunner/script/scene/ug08.cpp b/engines/bladerunner/script/scene/ug08.cpp
index b69e86472f..7cccb1bd40 100644
--- a/engines/bladerunner/script/scene/ug08.cpp
+++ b/engines/bladerunner/script/scene/ug08.cpp
@@ -124,7 +124,7 @@ bool SceneScriptUG08::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -432.0f, 0.0f, -152.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG08toUG07);
Set_Enter(kSetUG07, kSceneUG07);
return false;
diff --git a/engines/bladerunner/script/scene/ug09.cpp b/engines/bladerunner/script/scene/ug09.cpp
index d178d6ab76..1764c4474e 100644
--- a/engines/bladerunner/script/scene/ug09.cpp
+++ b/engines/bladerunner/script/scene/ug09.cpp
@@ -108,7 +108,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -67.0f, 156.94f, -425.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG09toCT12);
Set_Enter(kSetCT01_CT12, kSceneCT12);
}
@@ -118,7 +118,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -53.0f, 156.94f, 206.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG09ToUG07);
Set_Enter(kSetUG07, kSceneUG07);
}
diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp
index 4b6d4ae6da..ede1bcd061 100644
--- a/engines/bladerunner/script/scene/ug10.cpp
+++ b/engines/bladerunner/script/scene/ug10.cpp
@@ -250,7 +250,7 @@ void SceneScriptUG10::PlayerWalkedIn() {
void SceneScriptUG10::PlayerWalkedOut() {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
}
void SceneScriptUG10::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ug12.cpp b/engines/bladerunner/script/scene/ug12.cpp
index a17a7e9815..4189debe50 100644
--- a/engines/bladerunner/script/scene/ug12.cpp
+++ b/engines/bladerunner/script/scene/ug12.cpp
@@ -85,7 +85,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 375.0f, -126.21f, 180.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG12toUG14);
Set_Enter(kSetUG14, kSceneUG14);
}
@@ -95,7 +95,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 207.0f, -126.21f, -364.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG12toKP02);
Set_Enter(kSetKP02, kSceneKP02);
}
diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp
index c8e61b0a13..b544fd4e8a 100644
--- a/engines/bladerunner/script/scene/ug13.cpp
+++ b/engines/bladerunner/script/scene/ug13.cpp
@@ -345,7 +345,7 @@ void SceneScriptUG13::PlayerWalkedIn() {
void SceneScriptUG13::PlayerWalkedOut() {
Actor_Set_Invisible(kActorMcCoy, false);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
if (Game_Flag_Query(kFlagUG13toUG08)) {
Ambient_Sounds_Remove_Sound(kSfxYELL1M2, false);
Ambient_Sounds_Remove_Sound(kSfxYELL1M3, false);
diff --git a/engines/bladerunner/script/scene/ug14.cpp b/engines/bladerunner/script/scene/ug14.cpp
index a1844b5977..2625063fb8 100644
--- a/engines/bladerunner/script/scene/ug14.cpp
+++ b/engines/bladerunner/script/scene/ug14.cpp
@@ -96,7 +96,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -278.0f, 12.97f, -152.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG14toUG19);
Set_Enter(kSetUG19, kSceneUG19);
}
@@ -116,7 +116,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -50.0f, 129.0f, -814.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG14toUG12);
Set_Enter(kSetCT08_CT51_UG12, kSceneUG12);
}
@@ -140,7 +140,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) {
Footstep_Sound_Override_Off();
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 233.0f, 186.04f, -32.0f, 0, false, false, false);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG14toUG10);
Set_Enter(kSetUG10, kSceneUG10);
}
diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp
index 50f6e2e6b9..f018f4f935 100644
--- a/engines/bladerunner/script/scene/ug15.cpp
+++ b/engines/bladerunner/script/scene/ug15.cpp
@@ -122,7 +122,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -25.0f, 26.31f, -434.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG15toUG17);
Set_Enter(kSetUG17, kSceneUG17);
}
@@ -132,7 +132,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -17.0f, 26.31f, -346.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG15toUG16a);
Set_Enter(kSetUG16, kSceneUG16);
}
@@ -147,7 +147,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.61f, 48.07f, 147.12f, 0, true, false, false);
} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 18.0f, 52.28f, 46.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG15toUG16b);
Set_Enter(kSetUG16, kSceneUG16);
}
@@ -157,7 +157,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
if (exitId == 3) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -238.0f, 52.46f, 222.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG15toUG13);
Set_Enter(kSetUG13, kSceneUG13);
}
diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp
index 605c243c1c..a34f703f0a 100644
--- a/engines/bladerunner/script/scene/ug16.cpp
+++ b/engines/bladerunner/script/scene/ug16.cpp
@@ -148,7 +148,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -322.0f, -34.0f, -216.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG16toUG15b);
Set_Enter(kSetUG15, kSceneUG15);
}
@@ -158,7 +158,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -322.0f, -34.0f, -404.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG16toUG15a);
Set_Enter(kSetUG15, kSceneUG15);
}
@@ -170,7 +170,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) {
Actor_Face_Heading(kActorMcCoy, 0, false);
Loop_Actor_Travel_Stairs(kActorMcCoy, 13, true, kAnimationModeIdle);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG16toDR06);
Set_Enter(kSetDR06, kSceneDR06);
}
@@ -185,7 +185,7 @@ bool SceneScriptUG16::ClickedOn2DRegion(int region) {
void SceneScriptUG16::SceneFrameAdvanced(int frame) {
if (frame == 132) {
- Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, 1);
+ Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, 1u);
}
}
diff --git a/engines/bladerunner/script/scene/ug17.cpp b/engines/bladerunner/script/scene/ug17.cpp
index c9502b5c31..8e8ab9070b 100644
--- a/engines/bladerunner/script/scene/ug17.cpp
+++ b/engines/bladerunner/script/scene/ug17.cpp
@@ -69,7 +69,7 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1000.0f, 67.96f, -1539.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG17toUG15);
Set_Enter(kSetUG15, kSceneUG15);
}
@@ -84,7 +84,7 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) {
} else {
Loop_Actor_Travel_Ladder(kActorMcCoy, 10, true, kAnimationModeIdle);
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG17toTB03);
Set_Enter(kSetTB02_TB03, kSceneTB03);
}
diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 07d5d80a97..369f351077 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -176,7 +176,7 @@ bool SceneScriptUG18::ClickedOnExit(int exitId) {
if (exitId == 0) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -684.71f, 0.0f, 171.59f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG18toUG13);
Set_Enter(kSetUG13, kSceneUG13);
}
diff --git a/engines/bladerunner/script/scene/ug19.cpp b/engines/bladerunner/script/scene/ug19.cpp
index 1a228a0ee9..1ba7918c2e 100644
--- a/engines/bladerunner/script/scene/ug19.cpp
+++ b/engines/bladerunner/script/scene/ug19.cpp
@@ -91,7 +91,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) {
Loop_Actor_Travel_Ladder(kActorMcCoy, 8, true, kAnimationModeIdle);
Footstep_Sound_Override_Off();
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG19toMA07);
Set_Enter(kSetMA07, kSceneMA07);
}
@@ -101,7 +101,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) {
if (exitId == 1) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 181.0f, 11.52f, -18.0f, 0, true, false, false)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
- Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1u);
Game_Flag_Set(kFlagUG19toUG14);
Set_Enter(kSetUG14, kSceneUG14);
}
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
index 0305c72ef2..9402a2a41e 100644
--- a/engines/bladerunner/script/script.cpp
+++ b/engines/bladerunner/script/script.cpp
@@ -1177,19 +1177,19 @@ void ScriptBase::Footstep_Sound_Override_Off() {
_vm->_scene->_set->resetFoodstepSoundOverride();
}
-bool ScriptBase::Music_Play(int musicId, int volume, int pan, int32 timeFadeIn, int32 timePlay, int loop, int32 timeFadeOut) {
- debugC(kDebugScript, "Music_Play(%d, %d, %d, %d, %d, %d, %d)", musicId, volume, pan, timeFadeIn, timePlay, loop, timeFadeOut);
- return _vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), volume, pan, timeFadeIn, timePlay, loop, timeFadeOut);
+bool ScriptBase::Music_Play(int musicId, int volume, int pan, int32 timeFadeInSeconds, int32 timePlaySeconds, int loop, int32 timeFadeOutSeconds) {
+ debugC(kDebugScript, "Music_Play(%d, %d, %d, %d, %d, %d, %d)", musicId, volume, pan, timeFadeInSeconds, timePlaySeconds, loop, timeFadeOutSeconds);
+ return _vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), volume, pan, timeFadeInSeconds, timePlaySeconds, loop, timeFadeOutSeconds);
}
-void ScriptBase::Music_Adjust(int volume, int pan, uint32 delay) {
- debugC(kDebugScript, "Music_Adjust(%d, %d, %u)", volume, pan, delay);
- _vm->_music->adjust(volume, pan, delay);
+void ScriptBase::Music_Adjust(int volume, int pan, uint32 delaySeconds) {
+ debugC(kDebugScript, "Music_Adjust(%d, %d, %u)", volume, pan, delaySeconds);
+ _vm->_music->adjust(volume, pan, delaySeconds);
}
-void ScriptBase::Music_Stop(uint32 delay) {
- debugC(kDebugScript, "Music_Stop(%u)", delay);
- _vm->_music->stop(delay);
+void ScriptBase::Music_Stop(uint32 delaySeconds) {
+ debugC(kDebugScript, "Music_Stop(%u)", delaySeconds);
+ _vm->_music->stop(delaySeconds);
}
bool ScriptBase::Music_Is_Playing() {
@@ -1228,9 +1228,9 @@ void ScriptBase::Outtake_Play(int id, int noLocalization, int container) {
_vm->outtakePlay(id, noLocalization, container);
}
-void ScriptBase::Ambient_Sounds_Add_Sound(int sfxId, uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk) {
- debugC(kDebugScript, "Ambient_Sounds_Add_Sound(%d, %u, %u, %d, %d, %d, %d, %d, %d, %d, %d)", sfxId, timeMin, timeMax, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
- _vm->_ambientSounds->addSound(sfxId, timeMin, timeMax, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
+void ScriptBase::Ambient_Sounds_Add_Sound(int sfxId, uint32 delayMinSeconds, uint32 delayMaxSeconds, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk) {
+ debugC(kDebugScript, "Ambient_Sounds_Add_Sound(%d, %u, %u, %d, %d, %d, %d, %d, %d, %d, %d)", sfxId, delayMinSeconds, delayMaxSeconds, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
+ _vm->_ambientSounds->addSound(sfxId, delayMinSeconds, delayMaxSeconds, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
}
void ScriptBase::Ambient_Sounds_Remove_Sound(int sfxId, bool stopPlaying) {
@@ -1238,9 +1238,9 @@ void ScriptBase::Ambient_Sounds_Remove_Sound(int sfxId, bool stopPlaying) {
_vm->_ambientSounds->removeNonLoopingSound(sfxId, stopPlaying);
}
-void ScriptBase::Ambient_Sounds_Add_Speech_Sound(int actorId, int sentenceId, uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk) {
- debugC(kDebugScript, "Ambient_Sounds_Add_Speech_Sound(%d, %d, %u, %u, %d, %d, %d, %d, %d, %d, %d, %d)", actorId, sentenceId, timeMin, timeMax, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
- _vm->_ambientSounds->addSpeech(actorId, sentenceId, timeMin, timeMax, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
+void ScriptBase::Ambient_Sounds_Add_Speech_Sound(int actorId, int sentenceId, uint32 delayMinSeconds, uint32 delayMaxSeconds, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk) {
+ debugC(kDebugScript, "Ambient_Sounds_Add_Speech_Sound(%d, %d, %u, %u, %d, %d, %d, %d, %d, %d, %d, %d)", actorId, sentenceId, delayMinSeconds, delayMaxSeconds, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
+ _vm->_ambientSounds->addSpeech(actorId, sentenceId, delayMinSeconds, delayMaxSeconds, volumeMin, volumeMax, panStartMin, panStartMax, panEndMin, panEndMax, priority, unk);
}
// ScriptBase::Ambient_Sounds_Remove_Speech_Sound
@@ -1260,24 +1260,24 @@ void ScriptBase::Ambient_Sounds_Remove_All_Non_Looping_Sounds(bool stopPlaying)
_vm->_ambientSounds->removeAllNonLoopingSounds(stopPlaying);
}
-void ScriptBase::Ambient_Sounds_Add_Looping_Sound(int sfxId, int volume, int pan, uint32 delay) {
- debugC(kDebugScript, "Ambient_Sounds_Add_Looping_Sound(%d, %d, %d, %u)", sfxId, volume, pan, delay);
- _vm->_ambientSounds->addLoopingSound(sfxId, volume, pan, delay);
+void ScriptBase::Ambient_Sounds_Add_Looping_Sound(int sfxId, int volume, int pan, uint32 delaySeconds) {
+ debugC(kDebugScript, "Ambient_Sounds_Add_Looping_Sound(%d, %d, %d, %u)", sfxId, volume, pan, delaySeconds);
+ _vm->_ambientSounds->addLoopingSound(sfxId, volume, pan, delaySeconds);
}
-void ScriptBase::Ambient_Sounds_Adjust_Looping_Sound(int sfxId, int volume, int pan, uint32 delay) {
- debugC(kDebugScript, "Ambient_Sounds_Adjust_Looping_Sound(%d, %d, %d, %u)", sfxId, volume, pan, delay);
- _vm->_ambientSounds->adjustLoopingSound(sfxId, volume, pan, delay);
+void ScriptBase::Ambient_Sounds_Adjust_Looping_Sound(int sfxId, int volume, int pan, uint32 delaySeconds) {
+ debugC(kDebugScript, "Ambient_Sounds_Adjust_Looping_Sound(%d, %d, %d, %u)", sfxId, volume, pan, delaySeconds);
+ _vm->_ambientSounds->adjustLoopingSound(sfxId, volume, pan, delaySeconds);
}
-void ScriptBase::Ambient_Sounds_Remove_Looping_Sound(int sfxId, uint32 delay) {
- debugC(kDebugScript, "Ambient_Sounds_Remove_Looping_Sound(%d, %u)", sfxId, delay);
- _vm->_ambientSounds->removeLoopingSound(sfxId, delay);
+void ScriptBase::Ambient_Sounds_Remove_Looping_Sound(int sfxId, uint32 delaySeconds) {
+ debugC(kDebugScript, "Ambient_Sounds_Remove_Looping_Sound(%d, %u)", sfxId, delaySeconds);
+ _vm->_ambientSounds->removeLoopingSound(sfxId, delaySeconds);
}
-void ScriptBase::Ambient_Sounds_Remove_All_Looping_Sounds(uint32 delay) {
- debugC(kDebugScript, "Ambient_Sounds_Remove_All_Looping_Sounds(%u)", delay);
- _vm->_ambientSounds->removeAllLoopingSounds(delay);
+void ScriptBase::Ambient_Sounds_Remove_All_Looping_Sounds(uint32 delaySeconds) {
+ debugC(kDebugScript, "Ambient_Sounds_Remove_All_Looping_Sounds(%u)", delaySeconds);
+ _vm->_ambientSounds->removeAllLoopingSounds(delaySeconds);
}
void ScriptBase::Setup_Scene_Information(float actorX, float actorY, float actorZ, int actorFacing) {
@@ -1695,9 +1695,9 @@ void ScriptBase::ADQ_Add(int actorId, int sentenceId, int animationMode) {
_vm->_actorDialogueQueue->add(actorId, sentenceId, animationMode);
}
-void ScriptBase::ADQ_Add_Pause(int32 delay) {
- debugC(kDebugScript, "ADQ_Add_Pause(%d)", delay);
- _vm->_actorDialogueQueue->addPause(delay);
+void ScriptBase::ADQ_Add_Pause(int32 delayMillis) {
+ debugC(kDebugScript, "ADQ_Add_Pause(%d)", delayMillis);
+ _vm->_actorDialogueQueue->addPause(delayMillis);
}
void ScriptBase::ADQ_Wait_For_All_Queued_Dialogue() {
diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h
index 0ee951450c..1454c29bf6 100644
--- a/engines/bladerunner/script/script.h
+++ b/engines/bladerunner/script/script.h
@@ -177,26 +177,26 @@ protected:
void Footstep_Sounds_Set(int index, int value);
void Footstep_Sound_Override_On(int footstepSoundOverride);
void Footstep_Sound_Override_Off();
- bool Music_Play(int musicId, int volume, int pan, int32 timeFadeIn, int32 timePlay, int loop, int32 timeFadeOut);
- void Music_Adjust(int volume, int pan, uint32 delay);
- void Music_Stop(uint32 delay);
+ bool Music_Play(int musicId, int volume, int pan, int32 timeFadeInSeconds, int32 timePlaySeconds, int loop, int32 timeFadeOutSeconds);
+ void Music_Adjust(int volume, int pan, uint32 delaySeconds);
+ void Music_Stop(uint32 delaySeconds);
bool Music_Is_Playing();
void Overlay_Play(const char *overlay, int loopId, bool loopForever, bool startNow, int a5);
void Overlay_Remove(const char *overlay);
void Scene_Loop_Set_Default(int loopId);
void Scene_Loop_Start_Special(int sceneLoopMode, int loopId, bool immediately);
void Outtake_Play(int id, int noLocalization = false, int container = -1);
- void Ambient_Sounds_Add_Sound(int sfxId, uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk);
+ void Ambient_Sounds_Add_Sound(int sfxId, uint32 delayMinSeconds, uint32 delayMaxSeconds, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk);
void Ambient_Sounds_Remove_Sound(int sfxId, bool stopPlaying);
- void Ambient_Sounds_Add_Speech_Sound(int actorId, int sentenceId, uint32 timeMin, uint32 timeMax, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk);
+ void Ambient_Sounds_Add_Speech_Sound(int actorId, int sentenceId, uint32 delayMinSeconds, uint32 delayMaxSeconds, int volumeMin, int volumeMax, int panStartMin, int panStartMax, int panEndMin, int panEndMax, int priority, int unk);
// Ambient_Sounds_Remove_Speech_Sound
void Ambient_Sounds_Play_Sound(int sfxId, int volume, int panStart, int panEnd, int priority);
void Ambient_Sounds_Play_Speech_Sound(int actorId, int sfxId, int volume, int panStart, int panEnd, int priority);
void Ambient_Sounds_Remove_All_Non_Looping_Sounds(bool stopPlaying);
- void Ambient_Sounds_Add_Looping_Sound(int sfxId, int volume, int pan, uint32 delay);
- void Ambient_Sounds_Adjust_Looping_Sound(int sfxId, int volume, int pan, uint32 delay);
- void Ambient_Sounds_Remove_Looping_Sound(int sfxId, uint32 delay);
- void Ambient_Sounds_Remove_All_Looping_Sounds(uint32 delay);
+ void Ambient_Sounds_Add_Looping_Sound(int sfxId, int volume, int pan, uint32 delaySeconds);
+ void Ambient_Sounds_Adjust_Looping_Sound(int sfxId, int volume, int pan, uint32 delaySeconds);
+ void Ambient_Sounds_Remove_Looping_Sound(int sfxId, uint32 delaySeconds);
+ void Ambient_Sounds_Remove_All_Looping_Sounds(uint32 delaySeconds);
void Setup_Scene_Information(float actorX, float actorY, float actorZ, int actorFacing);
bool Dialogue_Menu_Appear(int x, int y);
bool Dialogue_Menu_Disappear();
@@ -270,7 +270,7 @@ protected:
void Set_Fog_Density(const char *fogName, float density);
void ADQ_Flush();
void ADQ_Add(int actorId, int sentenceId, int animationMode);
- void ADQ_Add_Pause(int32 delay);
+ void ADQ_Add_Pause(int32 delayMillis);
void ADQ_Wait_For_All_Queued_Dialogue();
bool Game_Over();
void Autosave_Game(int textId);
diff --git a/engines/bladerunner/settings.cpp b/engines/bladerunner/settings.cpp
index 722929fd55..b8744fd6e3 100644
--- a/engines/bladerunner/settings.cpp
+++ b/engines/bladerunner/settings.cpp
@@ -93,8 +93,8 @@ bool Settings::openNewScene() {
if (_startingGame) {
_vm->_ambientSounds->removeAllNonLoopingSounds(true);
- _vm->_ambientSounds->removeAllLoopingSounds(1);
- _vm->_music->stop(2);
+ _vm->_ambientSounds->removeAllLoopingSounds(1u);
+ _vm->_music->stop(2u);
}
int currentSet = _vm->_scene->getSetId();
diff --git a/engines/bladerunner/ui/spinner.cpp b/engines/bladerunner/ui/spinner.cpp
index c6d42b0a52..b00660d6f4 100644
--- a/engines/bladerunner/ui/spinner.cpp
+++ b/engines/bladerunner/ui/spinner.cpp
@@ -160,7 +160,7 @@ int Spinner::chooseDestination(int loopId, bool immediately) {
this
);
_vm->_actors[kActorAnsweringMachine]->speechPlay(480, false);
- _vm->_ambientSounds->addSound(kSfxSPINAMB2, 5, 30, 30, 45, 0, 0, -101, -101, 0, 0);
+ _vm->_ambientSounds->addSound(kSfxSPINAMB2, 5u, 30u, 30, 45, 0, 0, -101, -101, 0, 0);
} else {
_imagePicker->activate(
nullptr,
More information about the Scummvm-git-logs
mailing list