aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/kyra_hof.cpp4
-rw-r--r--engines/kyra/script_tim.cpp2
-rw-r--r--engines/kyra/sequences_hof.cpp2
-rw-r--r--engines/kyra/sequences_lol.cpp10
-rw-r--r--engines/kyra/sound.cpp2
-rw-r--r--engines/kyra/sound.h6
-rw-r--r--engines/kyra/sound_lok.cpp2
-rw-r--r--engines/kyra/sound_lol.cpp2
-rw-r--r--engines/kyra/sound_towns.cpp2
9 files changed, 16 insertions, 16 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 6057d3182a..eabc3ecb93 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -1486,7 +1486,7 @@ void KyraEngine_HoF::snd_playVoiceFile(int id) {
if (_sound->voiceFileIsPresent(vocFile)) {
snd_stopVoice();
- while (!_sound->voicePlay(vocFile, 255, false, &_speechHandle)) {
+ while (!_sound->voicePlay(vocFile, &_speechHandle)) {
updateWithText();
_system->delayMillis(10);
}
@@ -1524,7 +1524,7 @@ void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) {
int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]);
if (vocIndex != -1) {
- _sound->voicePlay(_ingameSoundList[vocIndex], 255, true);
+ _sound->voicePlay(_ingameSoundList[vocIndex], 0, 255, true);
} else if (_flags.platform == Common::kPlatformPC) {
if (_sound->getSfxType() == Sound::kMidiMT32)
track = track < _mt32SfxMapSize ? _mt32SfxMap[track] - 1 : -1;
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 80dca87763..f8ce7f7f3c 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -667,7 +667,7 @@ int TIMInterpreter::cmd_playVocFile(const uint16 *param) {
const int volume = (param[1] * 255) / 100;
if (index < ARRAYSIZE(_vocFiles) && !_vocFiles[index].empty())
- vm()->sound()->voicePlay(_vocFiles[index].c_str(), volume, true);
+ vm()->sound()->voicePlay(_vocFiles[index].c_str(), 0, volume, true);
else if (index == 7 && !_vm->gameFlags().isTalkie)
vm()->sound()->playTrack(index);
else
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 0a9f37f94d..7b42bfa935 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -2149,7 +2149,7 @@ void KyraEngine_HoF::seq_playTalkText(uint8 chatNum) {
if (chatNum < 12 && !_flags.isDemo && textEnabled())
seq_setTextEntry(chatNum, 160, 168, _sequenceStringsDuration[chatNum], 160);
- _sound->voicePlay(_sequenceSoundList[chatNum], 255, false, &_speechHandle);
+ _sound->voicePlay(_sequenceSoundList[chatNum], &_speechHandle);
}
void KyraEngine_HoF::seq_waitForTextsTimeout() {
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index bdcc3fd91d..f76bc5105a 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -367,7 +367,7 @@ void LoLEngine::kingSelectionIntro() {
_screen->fprintStringIntro(_tim->getCTableEntry(60), 8, y + 30, 0x32, 0x00, 0x9C, 0x20);
_screen->fprintStringIntro(_tim->getCTableEntry(61), 8, y + 40, 0x32, 0x00, 0x9C, 0x20);
- _sound->voicePlay("KING01", 255, false, &_speechHandle);
+ _sound->voicePlay("KING01", &_speechHandle);
int index = 4;
while ((!_speechFlag || (_speechFlag && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && !skipFlag()) {
@@ -406,7 +406,7 @@ void LoLEngine::kingSelectionReminder() {
_screen->fprintStringIntro(_tim->getCTableEntry(62), 8, y, 0x32, 0x00, 0x9C, 0x20);
_screen->fprintStringIntro(_tim->getCTableEntry(63), 8, y + 10, 0x32, 0x00, 0x9C, 0x20);
- _sound->voicePlay("KING02", 255, false, &_speechHandle);
+ _sound->voicePlay("KING02", &_speechHandle);
int index = 0;
while ((!_speechFlag || (_speechFlag && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && index < 15) {
@@ -433,7 +433,7 @@ void LoLEngine::kingSelectionReminder() {
}
void LoLEngine::kingSelectionOutro() {
- _sound->voicePlay("KING03", 255, false, &_speechHandle);
+ _sound->voicePlay("KING03", &_speechHandle);
int index = 0;
while ((!_speechFlag || (_speechFlag && _sound->voiceIsPlaying(&_speechHandle))) && !shouldQuit() && !skipFlag()) {
@@ -582,7 +582,7 @@ void LoLEngine::selectionCharInfoIntro(char *file) {
file[4] = '0';
while (_charSelectionInfoResult == -1 && !shouldQuit()) {
- if (!_sound->voicePlay(file, 255, false, &_speechHandle))
+ if (!_sound->voicePlay(file, &_speechHandle))
break;
int i = 0;
@@ -664,7 +664,7 @@ void LoLEngine::showStarcraftLogo() {
}
if (!(shouldQuit() || inputFlag)) {
- _sound->voicePlay("star2", 255, false, &_speechHandle);
+ _sound->voicePlay("star2", &_speechHandle);
while(_sound->voiceIsPlaying(&_speechHandle) && !(shouldQuit() || inputFlag)) {
inputFlag = checkInput(0) & 0xff;
delay(_tickLength);
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index 62eedae559..4c9d730c43 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -59,7 +59,7 @@ bool Sound::voiceFileIsPresent(const char *file) {
return false;
}
-int32 Sound::voicePlay(const char *file, uint8 volume, bool isSfx, Audio::SoundHandle *handle) {
+int32 Sound::voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx) {
Audio::AudioStream *audioStream = getVoiceStream(file);
if (!audioStream) {
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 6501d267b9..eac0f748cd 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -193,7 +193,7 @@ public:
* @param handle store a copy of the sound handle
* @return playtime of the voice file (-1 marks unknown playtime)
*/
- virtual int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false, Audio::SoundHandle *handle = 0);
+ virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle = 0, uint8 volume = 255, bool isSfx = false);
Audio::AudioStream *getVoiceStream(const char *file);
@@ -457,7 +457,7 @@ public:
void haltTrack();
void beginFadeOut();
- int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false, Audio::SoundHandle *handle = 0) { return -1; }
+ int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx) { return -1; }
void playSoundEffect(uint8);
protected:
@@ -484,7 +484,7 @@ public:
void haltTrack();
void beginFadeOut();
- int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false, Audio::SoundHandle *handle = 0);
+ int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx);
void playSoundEffect(uint8 track);
protected:
diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp
index 38651e2779..8aab4f6ce7 100644
--- a/engines/kyra/sound_lok.cpp
+++ b/engines/kyra/sound_lok.cpp
@@ -72,7 +72,7 @@ void KyraEngine_LoK::snd_playWanderScoreViaMap(int command, int restart) {
void KyraEngine_LoK::snd_playVoiceFile(int id) {
char vocFile[9];
snprintf(vocFile, sizeof(vocFile), "%03d", id);
- _speechPlayTime = _sound->voicePlay(vocFile, 255, false, &_speechHandle);
+ _speechPlayTime = _sound->voicePlay(vocFile, &_speechHandle);
}
void KyraEngine_LoK::snd_voiceWaitForFinish(bool ingame) {
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp
index 7afba2ae10..4cd033c885 100644
--- a/engines/kyra/sound_lol.cpp
+++ b/engines/kyra/sound_lol.cpp
@@ -178,7 +178,7 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) {
}
if (hasVocFile) {
- _sound->voicePlay(_ingameSoundList[vocIndex], volume & 0xff, true);
+ _sound->voicePlay(_ingameSoundList[vocIndex], 0, volume & 0xff, true);
} else if (_flags.platform == Common::kPlatformPC) {
if (_sound->getSfxType() == Sound::kMidiMT32)
track = track < _ingameMT32SoundIndexSize ? _ingameMT32SoundIndex[track] - 1 : -1;
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 3e39a1d131..443506a511 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -4231,7 +4231,7 @@ void SoundTownsPC98_v2::beginFadeOut() {
haltTrack();
}
-int32 SoundTownsPC98_v2::voicePlay(const char *file, uint8, bool, Audio::SoundHandle *handle) {
+int32 SoundTownsPC98_v2::voicePlay(const char *file, Audio::SoundHandle *handle, uint8, bool) {
static const uint16 rates[] = { 0x10E1, 0x0CA9, 0x0870, 0x0654, 0x0438, 0x032A, 0x021C, 0x0194 };
static const char patternHOF[] = "%s.PCM";
static const char patternLOL[] = "%s.VOC";
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 09:06:48 +0000