[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.35,1.35.2.1
Joost Peters
joostp at users.sourceforge.net
Sat Feb 21 13:04:05 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.96,1.97 logic.cpp,1.188,1.189 sound.cpp,1.35,1.36 talk.cpp,1.91,1.92
- Next message: [Scummvm-cvs-logs] CVS: residual bitmap.cpp,1.13,1.14 driver_gl.cpp,1.2,1.3 driver_gl.h,1.2,1.3 lua.cpp,1.36,1.37 main.cpp,1.18,1.19 smush.cpp,1.22,1.23 smush.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8063/queen
Modified Files:
Tag: branch-0-6-0
sound.cpp
Log Message:
Fix bug #899881 in 0-6-0 branch as well
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- sound.cpp 25 Jan 2004 22:10:23 -0000 1.35
+++ sound.cpp 21 Feb 2004 20:51:32 -0000 1.35.2.1
@@ -77,6 +77,9 @@
}
void Sound::playSfx(uint16 sfx, bool isSpeech) {
+ if (isSpeech && !speechOn()) return;
+ else if (!sfxOn()) return;
+
if (sfx != 0) {
char name[13];
strcpy(name, _sfxName[sfx - 1]);
@@ -87,6 +90,9 @@
}
void Sound::playSfx(const char *base, bool isSpeech) {
+ if (isSpeech && !speechOn()) return;
+ else if (!sfxOn()) return;
+
char name[13];
strcpy(name, base);
// alter filename to add zeros and append ".SB"
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.96,1.97 logic.cpp,1.188,1.189 sound.cpp,1.35,1.36 talk.cpp,1.91,1.92
- Next message: [Scummvm-cvs-logs] CVS: residual bitmap.cpp,1.13,1.14 driver_gl.cpp,1.2,1.3 driver_gl.h,1.2,1.3 lua.cpp,1.36,1.37 main.cpp,1.18,1.19 smush.cpp,1.22,1.23 smush.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list