diff options
-rw-r--r-- | engines/cge2/toolbar.cpp | 6 | ||||
-rw-r--r-- | engines/cge2/vmenu.cpp | 4 | ||||
-rw-r--r-- | engines/cge2/vmenu.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/cge2/toolbar.cpp b/engines/cge2/toolbar.cpp index 51614af8ed..be9f73e5b4 100644 --- a/engines/cge2/toolbar.cpp +++ b/engines/cge2/toolbar.cpp @@ -130,13 +130,13 @@ void CGE2Engine::checkMusicSwitch() { void CGE2Engine::quit() { Common::Array<Choice *> quitMenu; // Deleted in VMenu's destructor. - quitMenu.push_back(new StartCountDownChoice(this)); - quitMenu.push_back(new ResetQSwitchChoice(this)); + quitMenu.push_back(new ExitGameChoice(this)); + quitMenu.push_back(new ReturnToGameChoice(this)); if (_commandHandler->idle()) { if (VMenu::_addr) { _commandHandlerTurbo->addCommand(kCmdKill, -1, 0, VMenu::_addr); - ResetQSwitchChoice rqsChoice(this); + ReturnToGameChoice rqsChoice(this); rqsChoice.proc(); } else { quitMenu[0]->_text = _text->getText(kQuitText); diff --git a/engines/cge2/vmenu.cpp b/engines/cge2/vmenu.cpp index a84078f7a6..ceb69f099d 100644 --- a/engines/cge2/vmenu.cpp +++ b/engines/cge2/vmenu.cpp @@ -31,11 +31,11 @@ namespace CGE2 { -void StartCountDownChoice::proc() { +void ExitGameChoice::proc() { _vm->switchScene(-1); } -void ResetQSwitchChoice::proc() { +void ReturnToGameChoice::proc() { _vm->_commandHandlerTurbo->addCommand(kCmdSeq, kPowerRef, 1, nullptr); _vm->keyClick(); } diff --git a/engines/cge2/vmenu.h b/engines/cge2/vmenu.h index 724fb5d865..e28eee74b8 100644 --- a/engines/cge2/vmenu.h +++ b/engines/cge2/vmenu.h @@ -48,15 +48,15 @@ public: virtual ~Choice() {} }; -class StartCountDownChoice : public Choice { +class ExitGameChoice : public Choice { public: - StartCountDownChoice(CGE2Engine *vm) : Choice(vm) {} + ExitGameChoice(CGE2Engine *vm) : Choice(vm) {} void proc(); }; -class ResetQSwitchChoice : public Choice { +class ReturnToGameChoice : public Choice { public: - ResetQSwitchChoice(CGE2Engine *vm) : Choice(vm) {} + ReturnToGameChoice(CGE2Engine *vm) : Choice(vm) {} void proc(); }; |