GRIFFON: Remove recursiveness of the main menu

This commit is contained in:
Eugene Sandulenko 2019-11-06 13:28:31 +01:00
parent 008fbcab5b
commit 972a1474af
2 changed files with 8 additions and 6 deletions

View File

@ -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)) {

View File

@ -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;
}