aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-07-24 14:24:34 +0000
committerTravis Howell2004-07-24 14:24:34 +0000
commitce620d17fd46a4187bc7b0287410e2b926826b43 (patch)
tree940535d2889efd9a466de06007afe2b0f7b5e3da
parent370cf65966a0a14e12dbc8db68b2f0b3f6f1c546 (diff)
downloadscummvm-rg350-ce620d17fd46a4187bc7b0287410e2b926826b43.tar.gz
scummvm-rg350-ce620d17fd46a4187bc7b0287410e2b926826b43.tar.bz2
scummvm-rg350-ce620d17fd46a4187bc7b0287410e2b926826b43.zip
Remove lefts overs of old hack
svn-id: r14320
-rw-r--r--scumm/sound.cpp2
-rw-r--r--scumm/sound.h2
-rw-r--r--scumm/string.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index bbc9bb08ac..e6006f8893 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -875,7 +875,7 @@ void Sound::soundKludge(int *list, int num) {
}
}
-void Sound::talkSound(uint32 a, uint32 b, int mode, int frame) {
+void Sound::talkSound(uint32 a, uint32 b, int mode) {
if (mode == 1) {
_talk_sound_a1 = a;
_talk_sound_b1 = b;
diff --git a/scumm/sound.h b/scumm/sound.h
index aab2f377d6..77d04e46b2 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -96,7 +96,7 @@ public:
void stopSound(int a);
void stopAllSounds();
void soundKludge(int *list, int num);
- void talkSound(uint32 a, uint32 b, int mode, int frame);
+ void talkSound(uint32 a, uint32 b, int mode);
void setupSound();
void pauseSounds(bool pause);
diff --git a/scumm/string.cpp b/scumm/string.cpp
index be925f89f8..0135e67190 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -55,7 +55,7 @@ void ScummEngine::unkMessage1(const byte *msg) {
// FIXME: There are other VAR_V6_SOUNDMODE states, as
// mentioned in the patch. FIXME after iMUSE is done.
if (_gameId != GID_SAMNMAX || (VAR(VAR_V6_SOUNDMODE) != 2))
- _sound->talkSound(a, b, 1, -1);
+ _sound->talkSound(a, b, 1);
}
}
@@ -238,7 +238,7 @@ void ScummEngine::CHARSET_1() {
talk_sound_b = buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] << 24);
buffer += 14;
- _sound->talkSound(talk_sound_a, talk_sound_b, 2, frme);
+ _sound->talkSound(talk_sound_a, talk_sound_b, 2);
// Set flag that speech variant exist of this msg.
// TODO: This does not work for the speech system in V7+ games
@@ -828,7 +828,7 @@ void ScummEngine::playSpeech(const byte *ptr) {
_sound->stopTalkSound();
_imuseDigital->startVoice(kTalkSoundID, pointer);
- _sound->talkSound(0, 0, 2, -1);
+ _sound->talkSound(0, 0, 2);
}
}