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

Travis Howell kirben at users.sourceforge.net
Sat Jan 4 00:47:01 CET 2003


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

Modified Files:
	items.cpp vga.cpp 
Log Message:

Fix crashes in simon2dos/talkie caused by my music changes awhile back.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- items.cpp	3 Jan 2003 12:06:30 -0000	1.43
+++ items.cpp	4 Jan 2003 08:46:09 -0000	1.44
@@ -1491,8 +1491,10 @@
 				_vc70_var1 = 0xffff;
 				_vc72_var3 = 0xffff;
 				_midi_unk2 = 0xffff;
-				midi.initialize();
-				midi.play();
+				if (_game & GAME_WIN) {
+					midi.initialize();
+					midi.play();
+				}
 				_vc72_var1 = b;
 			} else {
 				_vc72_var3 = b;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- vga.cpp	3 Jan 2003 12:06:30 -0000	1.30
+++ vga.cpp	4 Jan 2003 08:46:10 -0000	1.31
@@ -1905,8 +1905,10 @@
 
 	if (_vc72_var1 == 999) {
 		_vc70_var2 = b;
-		midi.initialize();
-		midi.play();
+		if (_game & GAME_WIN) {
+			midi.initialize();
+			midi.play();
+		}
 		_vc72_var1 = b;
 	} else if (_vc72_var1 != 0xFFFF) {
 		if (_vc72_var1 != a) {





More information about the Scummvm-git-logs mailing list