From ba23b9f96e1a99d8271c4be9c445ebce986f8c6a Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Mon, 28 Jun 2004 09:03:08 +0000
Subject: [PATCH] Fix missing subtitles in Conroy Bumpus' song in Sam & Max

svn-id: r14101
---
 scumm/script.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scumm/script.cpp b/scumm/script.cpp
index 1288c1c8129..8d1f353c496 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -482,8 +482,12 @@ int ScummEngine::readVar(uint var) {
 			}
 		}
 
-		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)");