diff options
| author | Eugene Sandulenko | 2019-11-06 13:28:31 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
| commit | 972a1474af7de718f71a88af8545b905de54cefd (patch) | |
| tree | bd164a64610493f1c2f01815b7acd1ac2db5e786 | |
| parent | 008fbcab5b3683e03437fe136b1e72be95bcec9f (diff) | |
| download | scummvm-rg350-972a1474af7de718f71a88af8545b905de54cefd.tar.gz scummvm-rg350-972a1474af7de718f71a88af8545b905de54cefd.tar.bz2 scummvm-rg350-972a1474af7de718f71a88af8545b905de54cefd.zip | |
GRIFFON: Remove recursiveness of the main menu
| -rw-r--r-- | engines/griffon/dialogs.cpp | 5 | ||||
| -rw-r--r-- | engines/griffon/griffon.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp index be7dfaef2a..09aae2cb13 100644 --- a/engines/griffon/dialogs.cpp +++ b/engines/griffon/dialogs.cpp @@ -186,10 +186,11 @@ void GriffonEngine::title(int mode) { case Common::KEYCODE_RETURN: switch(cursel) { case 0: - saveLoadNew(); _ticks = g_system->getMillis(); keypause = _ticks + 150; ticks1 = _ticks; + + exitTitle = true; break; case 1: configMenu(); @@ -546,7 +547,7 @@ void GriffonEngine::saveLoadNew() { _shouldQuit = true; return; } - } + } if (lowerLock && tickpause < _ticks) { if ((curCol == 1) && saveState(curRow - 1)) { diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp index b921e74c80..42659ffee9 100644 --- a/engines/griffon/griffon.cpp +++ b/engines/griffon/griffon.cpp @@ -117,12 +117,13 @@ Common::Error GriffonEngine::run() { if (_shouldQuit) return Common::kNoError; - title(0); + while (!_shouldQuit) { + title(0); - if (_shouldQuit) - return Common::kNoError; + if (!_shouldQuit) - saveLoadNew(); + saveLoadNew(); + } return Common::kNoError; } |