diff options
| author | Paul Gilbert | 2010-03-27 10:44:38 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-03-27 10:44:38 +0000 |
| commit | a2de7bb0ef8118c32e6e3ad1a945a8021544c519 (patch) | |
| tree | d90c6fa014f68bfd3ca73998263b08cecacf60c9 /engines/m4/m4.cpp | |
| parent | 38f2c1b7a4eaa3dc136c6cd3c29d2b76f223d153 (diff) | |
| download | scummvm-rg350-a2de7bb0ef8118c32e6e3ad1a945a8021544c519.tar.gz scummvm-rg350-a2de7bb0ef8118c32e6e3ad1a945a8021544c519.tar.bz2 scummvm-rg350-a2de7bb0ef8118c32e6e3ad1a945a8021544c519.zip | |
Added the game options dialog, along with several bugfixes to dialog display code
svn-id: r48410
Diffstat (limited to 'engines/m4/m4.cpp')
| -rw-r--r-- | engines/m4/m4.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp index 624c83e842..01c51a5e19 100644 --- a/engines/m4/m4.cpp +++ b/engines/m4/m4.cpp @@ -524,10 +524,11 @@ Common::Error MadsEngine::run() { globs->loadMadsObjects(); // Setup globals - globs->easyMouse = true; - globs->invObjectsStill = false; - globs->textWindowStill = false; - globs->storyMode = 0; + globs->_config.easyMouse = true; + globs->_config.invObjectsStill = false; + globs->_config.textWindowStill = false; + globs->_config.storyMode = 1; // Naughty + globs->_config.screenFades = 0; // Test code to dump all messages to the console //for (int i = 0; i < _globals->getMessagesSize(); i++) @@ -600,6 +601,9 @@ void MadsEngine::showDialog() { case DIALOG_GAME_MENU: dlg = new RexGameMenuDialog(); break; + case DIALOG_OPTIONS: + dlg = new RexOptionsDialog(); + break; default: error("Unknown dialog type"); }; |