[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv29255/simon

Modified Files:
	simon.cpp 
Log Message:
fix crash in Simon (see patch #620625)

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- simon.cpp	22 Sep 2002 13:19:51 -0000	1.10
+++ simon.cpp	9 Oct 2002 20:54:15 -0000	1.11
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
+#include "sound/mididrv.h"
 #include "common/gameDetector.h"
 #include <errno.h>
 #include <time.h>
@@ -52,25 +53,6 @@
 	"GAMEPC",											/* gamepc_filename */
 };
 
-static const GameSpecificSettings simon2_settings = {
-	5,														/* VGA_DELAY_BASE */
-	1580 / 4,											/* TABLE_INDEX_BASE */
-	1500 / 4,											/* TEXT_INDEX_BASE */
-	2116 / 4,											/* NUM_GAME_OFFSETS */
-	75,														/* NUM_VIDEO_OP_CODES */
-	2000000,											/* VGA_MEM_SIZE */
-	100000,												/* TABLES_MEM_SIZE */
-	12256,												/* NUM_VOICE_RESOURCES */
-	0,
-	1128 / 4,											/* MUSIC_INDEX_BASE */
-	1660 / 4,											/* SOUND_INDEX_BASE */
-	"SIMON2.GME",									/* gme_filename */
-	"SIMON2.WAV",									/* wav_filename */
-	NULL,
-	"",
-	"GSPTR30",										/* gamepc_filename */
-};
-
 static const GameSpecificSettings simon2win_settings = {
 	5,														/* VGA_DELAY_BASE */
 	1580 / 4,											/* TABLE_INDEX_BASE */
@@ -122,6 +104,8 @@
 	_fcs_list = new FillOrCopyStruct[16];
 
 	/* Setup midi driver */
+	if (driver)
+		driver = MidiDriver_NULL_create();
 	midi.set_driver(driver);
 
 	_game = detector->_gameId;