[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.15,1.16 string.cpp,1.11,1.12 vars.cpp,1.1.1.1,1.2

James Brown ender at users.sourceforge.net
Mon Sep 16 01:23:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv17343/scumm

Modified Files:
	scumm.h string.cpp vars.cpp 
Log Message:
609791: Sam and Max 'phantom sound' (precaching) hack.



Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- scumm.h	13 Sep 2002 12:20:55 -0000	1.15
+++ scumm.h	16 Sep 2002 08:22:05 -0000	1.16
@@ -1313,6 +1313,7 @@
 
 	byte VAR_CUSTOMSCALETABLE;
 	byte VAR_VIDEONAME;
+	byte VAR_V6_SOUNDMODE;
 
 	void launch();
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- string.cpp	13 Sep 2002 11:59:43 -0000	1.11
+++ string.cpp	16 Sep 2002 08:22:05 -0000	1.12
@@ -173,10 +173,14 @@
 
 		a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24);
 		b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24);
-//    if (_saveSound != 1)
-		_sound->talkSound(a, b, 1, -1);
+
+		// Sam and Max uses a caching system, printing empty messages
+		// and setting VAR_V6_SOUNDMODE beforehand. See patch 609791.
+		// FIXME: There are other VAR_V6_SOUNDMODE states, as
+		// mentioned in the patch. FIXME after iMUSE is done.
+		if (_gameId != GID_SAMNMAX || (_vars[VAR_V6_SOUNDMODE] != 2))
+			_sound->talkSound(a, b, 1, -1);
 	}
-//  warning("unkMessage1(\"%s\")", buffer);
 }
 
 void Scumm::unkMessage2()

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vars.cpp	21 Aug 2002 16:07:36 -0000	1.1.1.1
+++ vars.cpp	16 Sep 2002 08:22:05 -0000	1.2
@@ -107,6 +107,8 @@
 	VAR_V6_SCREEN_HEIGHT = 54;
 	VAR_V6_EMSSPACE = 76;
 	VAR_V6_RANDOM_NR = 118;
+
+	VAR_V6_SOUNDMODE = 9;
 }
 
 





More information about the Scummvm-git-logs mailing list