[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.158,1.159
Travis Howell
kirben at users.sourceforge.net
Mon Jun 28 02:04:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25761/scumm
Modified Files:
script.cpp
Log Message:
Fix missing subtitles in Conroy Bumpus' song in Sam & Max
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- script.cpp 16 Apr 2004 05:48:31 -0000 1.158
+++ script.cpp 28 Jun 2004 09:03:08 -0000 1.159
@@ -482,8 +482,12 @@
}
}
- if ((_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) && var == VAR_NOSUBTITLES) {
- return !ConfMan.getBool("subtitles");
+ if (var == VAR_NOSUBTITLES) {
+ if (_gameId == GID_LOOM256 || _features & GF_HUMONGOUS)
+ return !ConfMan.getBool("subtitles");
+ else if (_gameId == GID_SAMNMAX)
+ // Used as VAR_SUBTITLES in Sam & Max during Conroy Bumpus song
+ return ConfMan.getBool("subtitles");
}
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
More information about the Scummvm-git-logs
mailing list