aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/simon/items.cpp98
-rw-r--r--engines/simon/simon.h1
2 files changed, 48 insertions, 51 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index ba6e85e669..afeb9f4938 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -1131,7 +1131,54 @@ void SimonEngine::o1_stopTune() {
void SimonEngine::o1_pauseGame() {
// 135: quit if user presses y
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
- o_confirmQuit();
+
+ // If all else fails, use English as fallback.
+ byte keyYes = 'y';
+ byte keyNo = 'n';
+
+ switch (_language) {
+ case Common::RU_RUS:
+ break;
+ case Common::PL_POL:
+ keyYes = 't';
+ break;
+ case Common::HB_ISR:
+ keyYes = 'f';
+ break;
+ case Common::ES_ESP:
+ keyYes = 's';
+ break;
+ case Common::IT_ITA:
+ keyYes = 's';
+ break;
+ case Common::FR_FRA:
+ keyYes = 'o';
+ break;
+ case Common::DE_DEU:
+ keyYes = 'j';
+ break;
+ default:
+ break;
+ }
+
+ for (;;) {
+ delay(1);
+#ifdef _WIN32_WCE
+ if (isSmartphone()) {
+ if (_keyPressed) {
+ if (_keyPressed == 13)
+ shutdown();
+ else
+ break;
+ }
+ }
+#endif
+ if (_keyPressed == keyYes)
+ shutdown();
+ else if (_keyPressed == keyNo)
+ break;
+ }
+
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
}
@@ -1907,55 +1954,6 @@ void SimonEngine::o_waitForMark(uint i) {
}
}
-void SimonEngine::o_confirmQuit() {
- // If all else fails, use English as fallback.
- byte keyYes = 'y';
- byte keyNo = 'n';
-
- switch (_language) {
- case Common::RU_RUS:
- break;
- case Common::PL_POL:
- keyYes = 't';
- break;
- case Common::HB_ISR:
- keyYes = 'f';
- break;
- case Common::ES_ESP:
- keyYes = 's';
- break;
- case Common::IT_ITA:
- keyYes = 's';
- break;
- case Common::FR_FRA:
- keyYes = 'o';
- break;
- case Common::DE_DEU:
- keyYes = 'j';
- break;
- default:
- break;
- }
-
- for (;;) {
- delay(1);
-#ifdef _WIN32_WCE
- if (isSmartphone()) {
- if (_keyPressed) {
- if (_keyPressed == 13)
- shutdown();
- else
- break;
- }
- }
-#endif
- if (_keyPressed == keyYes)
- shutdown();
- else if (_keyPressed == keyNo)
- break;
- }
-}
-
void SimonEngine::o_restoreIconArray(uint num) {
WindowBlock *window;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 235896eab7..a8e2d959fd 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -574,7 +574,6 @@ protected:
void o_waitForSync(uint a);
void skipSpeech();
void o_sync(uint a);
- void o_confirmQuit();
void o_restoreIconArray(uint a);
void o_freezeBottom();
void killAllTimers();