[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.203,1.204 sound.h,1.79,1.80

[kirben]

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

Modified Files:
	script.cpp sound.h 
Log Message:

Correct sound offset size


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- script.cpp	1 Jan 2005 16:09:15 -0000	1.203
+++ script.cpp	24 Jan 2005 10:07:16 -0000	1.204
@@ -499,9 +499,11 @@
 		if (var == VAR_NOSUBTITLES) {
 			if (_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) 
 				return !ConfMan.getBool("subtitles");	
-			else if (_gameId == GID_SAMNMAX)
+			else if (_gameId == GID_SAMNMAX) {
 				// Used as VAR_SUBTITLES in Sam & Max during Conroy Bumpus song
+				printf("Subtitles %d\n", ConfMan.getBool("subtitles"));
 				return ConfMan.getBool("subtitles");
+			}
 		}
 		
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- sound.h	20 Jan 2005 12:56:27 -0000	1.79
+++ sound.h	24 Jan 2005 10:07:17 -0000	1.80
@@ -62,7 +62,7 @@
 
 	struct {
 		int16 sound;
-		int16 offset;
+		int32 offset;
 		int16 channel;
 		int16 flags;
 	} _soundQue2[10];