diff options
| author | Sven Hesse | 2006-05-31 08:44:14 +0000 |
|---|---|---|
| committer | Sven Hesse | 2006-05-31 08:44:14 +0000 |
| commit | 05499f58dd2e79cae46bd4f250df946261bdac35 (patch) | |
| tree | 20e9ab41a9e9039a85edc9ab891587f7b55a9534 /engines/gob/game_v2.cpp | |
| parent | 321acd2740936efeb85eb5b771cbfc86a3545e9b (diff) | |
| download | scummvm-rg350-05499f58dd2e79cae46bd4f250df946261bdac35.tar.gz scummvm-rg350-05499f58dd2e79cae46bd4f250df946261bdac35.tar.bz2 scummvm-rg350-05499f58dd2e79cae46bd4f250df946261bdac35.zip | |
- Removed usage of OSystem::quit(), added a _quitRequested variable
- Fixed some leaks, unitialized memory and delete/delete[]-errors
svn-id: r22790
Diffstat (limited to 'engines/gob/game_v2.cpp')
| -rw-r--r-- | engines/gob/game_v2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp index 337b629b33..20a4e75abe 100644 --- a/engines/gob/game_v2.cpp +++ b/engines/gob/game_v2.cpp @@ -72,7 +72,7 @@ void Game_v2::playTot(int16 skipPlay) { strcpy(savedTotName, _curTotFile); if (skipPlay == 0) { - while (1) { + while (!_vm->_quitRequested) { for (i = 0; i < 4; i++) { _vm->_draw->_fontToSprite[i].sprite = -1; _vm->_draw->_fontToSprite[i].base = -1; @@ -422,7 +422,7 @@ int16 Game_v2::checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId, timeKey = _vm->_util->getTimeKey(); while (1) { - if (_vm->_inter->_terminate) { + if (_vm->_inter->_terminate || _vm->_quitRequested) { if (handleMouse) _vm->_draw->blitCursor(); return 0; |