diff options
| author | Eugene Sandulenko | 2005-05-18 16:18:00 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-05-18 16:18:00 +0000 |
| commit | f7df4797a88db569ab1e3472125772fecd0c4af8 (patch) | |
| tree | 2d214dcb910aa7aca2498d471b961e656a907cb7 /saga | |
| parent | d927a41638f7636bc1829ccd27a52df945e8ae19 (diff) | |
| download | scummvm-rg350-f7df4797a88db569ab1e3472125772fecd0c4af8.tar.gz scummvm-rg350-f7df4797a88db569ab1e3472125772fecd0c4af8.tar.bz2 scummvm-rg350-f7df4797a88db569ab1e3472125772fecd0c4af8.zip | |
Implement proper quitting. Added quitting to sfScriptGotoScene.
svn-id: r18173
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/input.cpp | 2 | ||||
| -rw-r--r-- | saga/sfuncs.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/saga/input.cpp b/saga/input.cpp index c93a5782be..d49dbdf3d3 100644 --- a/saga/input.cpp +++ b/saga/input.cpp @@ -127,7 +127,7 @@ int SagaEngine::processInput() { _mousePos = event.mouse; break; case OSystem::EVENT_QUIT: - _system->quit(); + _vm->shutDown(); break; default: break; diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 98ac131ae6..d58f1dadc0 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -504,7 +504,8 @@ void Script::sfScriptGotoScene(SCRIPTFUNC_PARAMS) { sceneNumber = thread->pop(); entrance = thread->pop(); if (sceneNumber < 0) { - //TODO: quit from game at all + _vm->shutDown(); + return; } // This is used for latter demos where all places on world map except |