The mult_playSound() function makes absolutely no sense at all to me, so

I've changed it to something that doesn't trigger assertions in the
Gobliiins demo intro.

svn-id: r17907

2 files changed, 3 insertions, 8 deletions

diff --git a/gob/mult.cpp b/gob/mult.cpp
index 3869a9223f..798d59dd9d 100644
--- a/gob/mult.cpp
+++ b/gob/mult.cpp
@@ -545,11 +545,8 @@ void mult_initAll(void) {
 }
 
 void mult_playSound(Snd_SoundDesc * soundDesc, int16 repCount, int16 freq,
-	    int16 negFreq) {
-	if (soundDesc->frequency == freq)
-		snd_playSample(soundDesc, repCount, -negFreq);
-	else
-		snd_playSample(soundDesc, repCount, freq);
+	    int16 channel) {
+	snd_playSample(soundDesc, repCount, freq);
 }
 
 char mult_drawStatics(char stop) {
diff --git a/gob/mult.h b/gob/mult.h
index 8c0947e67b..1430e532df 100644
--- a/gob/mult.h
+++ b/gob/mult.h
@@ -170,8 +170,6 @@ extern int16 mult_sndSlotsCount;
 extern int16 mult_sndKeysCount;
 extern Mult_SndKey *mult_sndKeys;
 
-void mult_playSound(Snd_SoundDesc * soundDesc, int16 repCount, int16 freq,
-    int16 negFreq);
 void mult_zeroMultData(void);
 void mult_loadMult(int16 resId);
 void mult_freeMultKeys(void);
@@ -186,7 +184,7 @@ void mult_interLoadMult(void);
 void mult_freeAll(void);
 void mult_initAll(void);
 void mult_playSound(Snd_SoundDesc * soundDesc, int16 repCount, int16 freq,
-    int16 negFreq);
+    int16 channel);
 void mult_playMult(int16 startFrame, int16 endFrame, char checkEscape,
     char handleMouse);
 void mult_zeroMultData(void);