diff options
| author | Christopher Page | 2008-07-13 21:54:23 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-13 21:54:23 +0000 |
| commit | e7d7f8df95fc45c9fedb5238e6634080cb8f49cf (patch) | |
| tree | 67d0b165c5dbf9ab4f9f3ef34a53a37a21f2c016 /engines/sword1/control.cpp | |
| parent | a6e1d6bd3dcdc1fae7832ffe26b4d774ec1fe6a3 (diff) | |
| download | scummvm-rg350-e7d7f8df95fc45c9fedb5238e6634080cb8f49cf.tar.gz scummvm-rg350-e7d7f8df95fc45c9fedb5238e6634080cb8f49cf.tar.bz2 scummvm-rg350-e7d7f8df95fc45c9fedb5238e6634080cb8f49cf.zip | |
SWORD1 works with the new GMM implementation
svn-id: r33043
Diffstat (limited to 'engines/sword1/control.cpp')
| -rw-r--r-- | engines/sword1/control.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 980e0b4f9f..3a26f4dd33 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -215,7 +215,7 @@ void Control::askForCd(void) { notAccepted = false; } } - } while (notAccepted && (!SwordEngine::_systemVars.engineQuit)); + } while (notAccepted && (!g_engine->quit())); _resMan->resClose(fontId); free(_screenBuf); @@ -317,7 +317,7 @@ uint8 Control::runPanel(void) { } delay(1000 / 12); newMode = getClicks(mode, &retVal); - } while ((newMode != BUTTON_DONE) && (retVal == 0) && (!SwordEngine::_systemVars.engineQuit)); + } while ((newMode != BUTTON_DONE) && (retVal == 0) && (!g_engine->quit())); if (SwordEngine::_systemVars.controlPanelMode == CP_NORMAL) { uint8 volL, volR; @@ -425,7 +425,7 @@ uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) { _buttons[5]->setSelected(SwordEngine::_systemVars.showText); } else if (id == BUTTON_QUIT) { if (getConfirm(_lStrings[STR_QUIT])) - SwordEngine::_systemVars.engineQuit = true; + g_engine->quitGame(); return mode; } break; @@ -1091,9 +1091,6 @@ void Control::delay(uint32 msecs) { _mouseDown = false; _mouseState |= BS1_WHEEL_DOWN; break; - case Common::EVENT_QUIT: - SwordEngine::_systemVars.engineQuit = true; - break; default: break; } |