[Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.43,1.44

Travis Howell kirben at users.sourceforge.net
Mon May 19 19:34:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv3806/simon

Modified Files:
	vga.cpp 
Log Message:

vc_69 update from Jamieson630


Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- vga.cpp	19 May 2003 10:24:51 -0000	1.43
+++ vga.cpp	20 May 2003 02:33:28 -0000	1.44
@@ -1810,15 +1810,13 @@
 	if (_debugMode)
 		warning("vc_69(%d,%d): music stuff?", a, b);
 
-	if (_vc72_var1 == 999) {
+	if (_vc72_var1 == 999 || _vc72_var1 == 0xFFFF) {
 		_vc70_var2 = b;
-		midi_play(a);
-		_vc72_var1 = b;
-	} else if (_vc72_var1 != 0xFFFF) {
-		if (_vc72_var1 != a) {
-			_vc72_var3 = a;
-			_vc72_var2 = a;
-		}
+		midi_play (a);
+		_vc72_var1 = a;
+	} else if (_vc72_var1 != a) {
+		_vc72_var3 = a;
+		_vc72_var2 = (a & 0xFF) << 8 | (a >> 8);
 	}
 
 }





More information about the Scummvm-git-logs mailing list