diff options
| -rw-r--r-- | scumm/input.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 12 | ||||
| -rw-r--r-- | scumm/scumm.h | 10 |
4 files changed, 13 insertions, 15 deletions
diff --git a/scumm/input.cpp b/scumm/input.cpp index 483ccd2cf7..984efce08f 100644 --- a/scumm/input.cpp +++ b/scumm/input.cpp @@ -193,7 +193,7 @@ void ScummEngine::parseEvents() { case OSystem::EVENT_QUIT: if (_confirmExit) - confirmexitDialog(); + confirmExitDialog(); else _quit = true; break; @@ -375,7 +375,7 @@ void ScummEngine::processKbd(bool smushMode) { if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY) || (((_version <= 2) || (_features & GF_FMTOWNS && _version == 3)) && _lastKeyHit == 8)) { - confirmrestartDialog(); + confirmRestartDialog(); return; } diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 738b0c69f0..8db393bc75 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1307,7 +1307,7 @@ void ScummEngine_v8::o8_kernelSetFunctions() { break; case 34: // queryQuit if (_confirmExit) - confirmexitDialog(); + confirmExitDialog(); else _quit = true; break; diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 7af33ab45e..d99595d392 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -2274,18 +2274,18 @@ void ScummEngine::mainMenuDialog() { runDialog(*_mainMenuDialog); } -void ScummEngine::confirmexitDialog() { - ConfirmDialog confirmExitDialog(this, "Do you really want to quit (y/n)?"); +void ScummEngine::confirmExitDialog() { + ConfirmDialog d(this, "Do you really want to quit (y/n)?"); - if (runDialog(confirmExitDialog)) { + if (runDialog(d)) { _quit = true; } } -void ScummEngine::confirmrestartDialog() { - ConfirmDialog confirmRestartDialog(this, "Do you really want to restart (y/n)?"); +void ScummEngine::confirmRestartDialog() { + ConfirmDialog d(this, "Do you really want to restart (y/n)?"); - if (runDialog(confirmRestartDialog)) { + if (runDialog(d)) { restart(); } } diff --git a/scumm/scumm.h b/scumm/scumm.h index 6ad002e63c..80ee075b0d 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -384,7 +384,6 @@ public: byte _gameId; byte _version; byte _heversion; - byte _numActors; uint32 _features; // Should only be accessed for reading (TODO enforce it compiler-wise with making it private and creating an accessor) uint8 _gameMD5[16]; @@ -465,19 +464,18 @@ protected: Dialog *_versionDialog; Dialog *_mainMenuDialog; -protected: int runDialog(Dialog &dialog); - void confirmexitDialog(); - void confirmrestartDialog(); + void confirmExitDialog(); + void confirmRestartDialog(); void pauseDialog(); void versionDialog(); void mainMenuDialog(); -protected: + char displayMessage(const char *altButton, const char *message, ...); -protected: byte _fastMode; + byte _numActors; Actor *_actors; // Has _numActors elements byte *_arraySlot; |