[Scummvm-cvs-logs] SF.net SVN: scummvm: [21755] scummvm/trunk/engines/simon

[eriktorbjorn at users.sourceforge.net]

Revision: 21755
Author:   eriktorbjorn
Date:     2006-04-10 01:22:03 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21755&view=rev

Log Message:
-----------
Merged o_confirmQuit() into o1_pauseGame().

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-10 08:09:49 UTC (rev 21754)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 08:22:03 UTC (rev 21755)
@@ -1131,7 +1131,54 @@
 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_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;
 

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 08:09:49 UTC (rev 21754)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 08:22:03 UTC (rev 21755)
@@ -574,7 +574,6 @@
 	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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.