[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.322,1.323
kirben
kirben at users.sourceforge.net
Mon Jan 23 19:47:06 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17095/scumm
Modified Files:
string.cpp
Log Message:
Loom (Cd) specific.
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- string.cpp 23 Jan 2006 20:09:25 -0000 1.322
+++ string.cpp 24 Jan 2006 03:46:22 -0000 1.323
@@ -578,8 +578,8 @@
// HE games which use sprites for subtitles
} else if (_heversion >= 60 && !ConfMan.getBool("subtitles") && _sound->isSoundRunning(1)) {
// Special case for HE games
- } else if ((_gameId == GID_LOOM) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
- // Special case for loomcd, since it only uses CD audio.for sound
+ } else if (_gameId == GID_LOOM && _version == 4 && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
+ // Special case for Loom (CD), since it only uses CD audio.for sound
} else if (!ConfMan.getBool("subtitles") && (!_haveActorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) {
// Subtitles are turned off, and there is a voice version
// of this message -> don't print it.
More information about the Scummvm-git-logs
mailing list