Ticket #9121: dott_mm.patch

backends/events/default/default-events.h

@@ -90 +90 @@
         virtual int shouldQuit() const { return _shouldQuit; }
         virtual int shouldRTL() const { return _shouldRTL; }
         virtual void resetRTL() { _shouldRTL = false; }
-#ifdef FORCE_RTL
         virtual void resetQuit() { _shouldQuit = false; }
-#endif
 
 #ifdef ENABLE_KEYMAPPER
         virtual Common::Keymapper *getKeymapper() { return _keymapper; }

base/main.cpp

@@ -393 +393 @@
                                 // TODO: Show an informative error dialog if starting the selected game failed.
                         }
 
+                        bool forceRTL = false;
+                        #ifdef FORCE_RTL
+                        forceRTL = true;
+                        #endif
+                        if (ConfMan.hasNextDomain())
+                                forceRTL = true;
+
                         // Quit unless an error occurred, or Return to launcher was requested
-                        #ifndef FORCE_RTL
-                        if (result == 0 && !g_system->getEventManager()->shouldRTL())
+                        if (result == 0 && !forceRTL && !g_system->getEventManager()->shouldRTL())
                                 break;
-                        #endif
+
                         // Reset RTL flag in case we want to load another engine
                         g_system->getEventManager()->resetRTL();
-                        #ifdef FORCE_RTL
-                        g_system->getEventManager()->resetQuit();
-                        #endif
+                        if (forceRTL)
+                                g_system->getEventManager()->resetQuit();
 
+                        Common::ConfigManager::Domain *transientDomain = ConfMan.getDomain(Common::ConfigManager::kTransientDomain);
+
                         // Discard any command line options. It's unlikely that the user
                         // wanted to apply them to *all* games ever launched.
-                        ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
+                        transientDomain->clear();
 
-                        // Clear the active config domain
-                        ConfMan.setActiveDomain("");
+                        // setup the domain
+                        if (ConfMan.hasNextDomain()) {
+                                // set active domain to next pending domain
+                                Common::ConfigManager::DomainQueueEntry nextDomain = ConfMan.dequeueNextDomain();
+                                ConfMan.setActiveDomain(nextDomain.getName());
 
+                                // set transient options
+                                const Common::StringMap &transientOptions = nextDomain.getTransientOptions();
+                                Common::StringMap::const_iterator iter;
+                                for (iter = transientOptions.begin(); iter != transientOptions.end(); ++iter) {
+                                        transientDomain->setVal(iter->_key, iter->_value);
+                                }
+                        } else {
+                                // Clear the active config domain
+                                ConfMan.setActiveDomain("");
+                        }
+
                         // PluginManager::instance().unloadPlugins();
                         PluginManager::instance().loadPlugins();
                 } else {
@@ -430 +451 @@
 
                 // reset the graphics to default
                 setupGraphics(system);
-                launcherDialog();
+                if (0 == ConfMan.getActiveDomain()) {
+                        launcherDialog();
+                }
         }
         PluginManager::instance().unloadPlugins();
         PluginManager::destroy();

common/config-manager.cpp

@@ -632 +632 @@
         return isValidDomainName(domName) && _gameDomains.contains(domName);
 }
 
+void ConfigManager::enqueueNextDomain(const String &domName, const StringMap &transientOptions) {
+        DomainQueueEntry entry(domName, transientOptions);
+        _domainQueue.push_back(entry); 
+}
 
+ConfigManager::DomainQueueEntry ConfigManager::dequeueNextDomain() {
+        if (_domainQueue.empty()) 
+                return DomainQueueEntry(); 
+        else 
+                return _domainQueue.remove_at(0); 
+}
+
+
 #pragma mark -
 
 

common/config-manager.h

@@ -68 +68 @@
 
         typedef HashMap<String, Domain, IgnoreCase_Hash, IgnoreCase_EqualTo> DomainMap;
 
+        class DomainQueueEntry {
+        private:
+                String _domainName;
+                StringMap _transientOptions;
+        public:
+                DomainQueueEntry()
+                        : _domainName("") {}
+                DomainQueueEntry(const String &domName, const StringMap &transientOptions) 
+                        : _domainName(domName), _transientOptions(transientOptions) {}
+                const String &getName() { return _domainName; }
+                const StringMap &getTransientOptions() { return _transientOptions; }
+        };
+
 #if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
         /** The name of the application domain (normally 'scummvm'). */
         static const String kApplicationDomain;
@@ -150 +163 @@
         const Domain *          getActiveDomain() const { return _activeDomain; }
         const String &          getActiveDomainName() const { return _activeDomainName; }
 
+        bool                            hasNextDomain() { return !_domainQueue.empty(); }
+        void                            enqueueNextDomain(const String &domName, const StringMap &transientOptions = StringMap());
+        DomainQueueEntry        dequeueNextDomain(); 
+
         void                            addGameDomain(const String &domName);
         void                            removeGameDomain(const String &domName);
         void                            renameGameDomain(const String &oldName, const String &newName);
@@ -178 +195 @@
         String                  _activeDomainName;
         Domain *                _activeDomain;
 
+        Array<DomainQueueEntry> _domainQueue;
+
         String                  _filename;
 };
 

common/events.h

@@ -377 +377 @@
          * Used when we have returned to the launcher.
          */
         virtual void resetRTL() = 0;
-#ifdef FORCE_RTL
         virtual void resetQuit() = 0;
-#endif
+
         // Optional: check whether a given key is currently pressed ????
         //virtual bool isKeyPressed(int keycode) = 0;
 

engines/scumm/script.cpp

@@ -1038 +1038 @@
         }
 }
 
+void ScummEngine::killAllScripts() {
+        for (int i = 0; i < NUM_SCRIPT_SLOT; i++) {
+                vm.slot[i].status = ssDead;
+                vm.slot[i].cutsceneOverride = 0;
+        }
+}
+
 void ScummEngine::doSentence(int verb, int objectA, int objectB) {
         SentenceTab *st;
 

engines/scumm/scumm.cpp

@@ -30 +30 @@
 #include "common/system.h"
 
 #include "gui/message.h"
+#include "gui/launcher.h"
 #include "gui/GuiManager.h"
 
 #include "graphics/cursorman.h"
@@ -2365 +2366 @@
 #endif
 
 void ScummEngine::startManiac() {
-        debug(0, "stub startManiac()");
-        displayMessage(0, "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
+        // prevent to start MM again after a restart of DOTT
+        if (ConfMan.hasKey("dott_restart_after_mm")) {
+                ConfMan.removeKey("dott_restart_after_mm", Common::ConfigManager::kTransientDomain);
+                return;
+        }
+
+        // find maniac mansion launcher entry
+        Common::String mmDomain;
+        Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
+        Common::ConfigManager::DomainMap::iterator iter = domains.begin();
+        for (iter = domains.begin(); iter != domains.end(); ++iter) {
+                Common::ConfigManager::Domain &dom = iter->_value;
+                Common::String gameid(dom.get("gameid"));
+                if (gameid.equals("maniac"))
+                        mmDomain = iter->_key;
+        }
+
+        if (mmDomain.empty()) {
+                displayMessage(0, "To play Maniac Mansion you have to add it to the ScummVM launcher first. Go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
+                return;
+        }
+
+        // save current state for restart
+        strcpy(_saveLoadName, "Autosave 0");
+        if (!saveState(0, false)) {
+                displayMessage(0, "Could not save state. Maniac Mansion will not be executed!");
+                return;
+        }
+
+        // add MM to launcher queue
+        ConfMan.enqueueNextDomain(mmDomain);
+
+        // add DOTT (with current savestate and transient options) to launcher queue
+        Common::StringMap dottOptions = *ConfMan.getDomain(Common::ConfigManager::kTransientDomain);
+        dottOptions.setVal("save_slot", "0");
+        dottOptions.setVal("dott_restart_after_mm", "true");
+        ConfMan.enqueueNextDomain(ConfMan.getActiveDomainName(), dottOptions);
+
+        // return to launcher
+        killAllScripts();
+        quitGame();
 }
 
 #pragma mark -

engines/scumm/scumm.h

@@ -729 +729 @@
         bool isScriptRunning(int script) const;
 
         void killAllScriptsExceptCurrent();
+        void killAllScripts();
         void killScriptsAndResources();
         void decreaseScriptDelay(int amount);