[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.149.2.2,1.149.2.3

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31290/scumm

Modified Files:
      Tag: branch-0-6-0
	script.cpp 
Log Message:

Back port conroy bumpus song subtitles fix.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.149.2.2
retrieving revision 1.149.2.3
diff -u -d -r1.149.2.2 -r1.149.2.3
--- script.cpp	3 May 2004 10:57:44 -0000	1.149.2.2
+++ script.cpp	21 Jul 2004 10:58:32 -0000	1.149.2.3
@@ -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)");