[Scummvm-cvs-logs] CVS: scummvm/gob mult.cpp,1.8,1.9 mult.h,1.3,1.4
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Wed May 4 00:32:32 CEST 2005
Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30842
Modified Files:
mult.cpp mult.h
Log Message:
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.
Index: mult.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mult.cpp 10 Apr 2005 17:13:17 -0000 1.8
+++ mult.cpp 4 May 2005 07:32:11 -0000 1.9
@@ -545,11 +545,8 @@
}
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) {
Index: mult.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mult.h 9 Apr 2005 19:19:54 -0000 1.3
+++ mult.h 4 May 2005 07:32:12 -0000 1.4
@@ -170,8 +170,6 @@
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_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);
More information about the Scummvm-git-logs
mailing list