[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.356,1.357 sound.h,1.69,1.70 string.cpp,1.228,1.229

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3880/scumm

Modified Files:
	sound.cpp sound.h string.cpp 
Log Message:

Remove lefts overs of old hack


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -d -r1.356 -r1.357
--- sound.cpp	24 Jul 2004 13:36:26 -0000	1.356
+++ sound.cpp	24 Jul 2004 14:24:34 -0000	1.357
@@ -875,7 +875,7 @@
 	}
 }
 
-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;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- sound.h	24 Jul 2004 13:36:26 -0000	1.69
+++ sound.h	24 Jul 2004 14:24:34 -0000	1.70
@@ -96,7 +96,7 @@
 	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);
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- string.cpp	24 Jul 2004 13:36:26 -0000	1.228
+++ string.cpp	24 Jul 2004 14:24:34 -0000	1.229
@@ -55,7 +55,7 @@
 		// 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 @@
 				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 @@
 
 		_sound->stopTalkSound();
 		_imuseDigital->startVoice(kTalkSoundID, pointer);
-		_sound->talkSound(0, 0, 2, -1);
+		_sound->talkSound(0, 0, 2);
 	}
 }