Ticket #8084: simon.diff

scummvm/common/engine.cpp

@@ -84 +84 @@
 
         if (detector->_gameId >= GID_SIMON_FIRST && detector->_gameId <= GID_SIMON_LAST) {
                 // Simon the Sorcerer
-                detector->_gameId -= GID_SIMON_FIRST;
+                detector->_gameId2 = detector->_gameId - GID_SIMON_FIRST;
                 engine = new SimonState(detector, syst);
         } else {
                 // Some kind of Scumm game

scummvm/common/engine.h

@@ -30 +30 @@
 class SoundMixer;
 class GameDetector;
 
-/* FIXME - BIG HACK for MidiEmu */
+/* FIXME - BIG HACK for MidiEmu and error() */
 extern OSystem *g_system;
 extern SoundMixer *g_mixer;
 

scummvm/common/gameDetector.cpp

@@ -590 +590 @@
         /*        preference */ 
         if (drv == MD_AUTO) {
                 _use_adlib = true;
+
+                // Neither MD_ALSA nor MD_SEQ work for Simon, and there is no
+                // MIDI -> AdLib converter for it. But we can't return NULL
+                // here because that'll cause ScummVM to crash.
+                if (_gameId >= GID_SIMON_FIRST && _gameId <= GID_SIMON_LAST)
+                        return MidiDriver_NULL_create();
+
                 return NULL;
         }
 #endif

scummvm/common/gameDetector.h

@@ -52 +52 @@
         const char *getGameName(void);
 
         bool _fullScreen;
-        byte _gameId;
+        byte _gameId, _gameId2;
 
         bool _use_adlib;
 

scummvm/scumm/scummvm.cpp

@@ -1335 +1335 @@
         }
         
         // Finally exit. quit() will terminate the program
-        g_scumm->_system->quit();
+        g_system->quit();
         
         
         // This point should never be reached. However, since virtual methods (like quit() is)

scummvm/simon/simon.cpp

@@ -124 +124 @@
         /* Setup midi driver */
         midi.set_driver(driver);
 
-        _game = detector->_gameId;
+        _game = detector->_gameId2;
 
         /* Setup mixer */
         if (!_mixer->bindToSystem(syst))