[Scummvm-cvs-logs] SF.net SVN: scummvm: [23625] scummvm/trunk/backends/platform/wince

knakos at users.sourceforge.net knakos at users.sourceforge.net
Sun Jul 30 11:03:17 CEST 2006


Revision: 23625
Author:   knakos
Date:     2006-07-30 02:03:10 -0700 (Sun, 30 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23625&view=rev

Log Message:
-----------
CinE Engine support (backport)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
    scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp	2006-07-30 09:00:44 UTC (rev 23624)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp	2006-07-30 09:03:10 UTC (rev 23625)
@@ -125,12 +125,14 @@
 	bool is_ite = ((strncmp(gameid.c_str(), "ite", 3) == 0) ||
 				  (strncmp(gameid.c_str(), "ihnm", 4) == 0));
 	bool is_kyra = (gameid == "kyra1");
+	bool is_samnmax = (gameid == "samnmax");
+	bool is_fw = (gameid == "fw");
+	bool is_os = (gameid == "os");
 
 	GUI_Actions::initInstanceGame();
 
 	// See if a right click mapping could be needed
-	if (is_sword1 || is_sword2 || is_sky || is_queen || is_comi || is_gob ||
-		gameid == "samnmax")
+	if (is_sword1 || is_sword2 || is_sky || is_queen || is_comi || is_gob || is_samnmax || is_fw || is_os)
 		_right_click_needed = true;
 
 	// See if a "hide toolbar" mapping could be needed
@@ -144,24 +146,24 @@
 	// Save
 	if (is_simon || is_sword2 || is_gob || is_kyra)
 		_action_enabled[POCKET_ACTION_SAVE] = false;
-	else
-	if (is_queen || is_ite) {
+	else if (is_queen || is_ite) {
 		_action_enabled[POCKET_ACTION_SAVE] = true;
 		_key_action[POCKET_ACTION_SAVE].setAscii(286); // F5 key for FOTAQ & ITE
-	}
-	else
-	if (is_sky) {
+	} else if (is_sky) {
 		_action_enabled[POCKET_ACTION_SAVE] = true;
 		_key_action[POCKET_ACTION_SAVE].setAscii(63);
-	}
-	else {
+	} else if (is_fw || is_os) {
 		_action_enabled[POCKET_ACTION_SAVE] = true;
+		_key_action[POCKET_ACTION_SAVE].setAscii(291); // F10
+	} else {
+		_action_enabled[POCKET_ACTION_SAVE] = true;
 		_key_action[POCKET_ACTION_SAVE].setAscii(319); // F5 key
 	}
 	// Quit
 	_action_enabled[POCKET_ACTION_QUIT] = true;
 	// Skip
-	_action_enabled[POCKET_ACTION_SKIP] = true;
+	if (!is_fw && !is_os)
+		_action_enabled[POCKET_ACTION_SKIP] = true;
 	if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_ite || is_kyra)
 		_key_action[POCKET_ACTION_SKIP].setAscii(VK_ESCAPE);
 	else

Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp	2006-07-30 09:00:44 UTC (rev 23624)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp	2006-07-30 09:03:10 UTC (rev 23625)
@@ -125,29 +125,31 @@
 	bool is_ite = ((strncmp(gameid.c_str(), "ite", 3) == 0) ||
 				  (strncmp(gameid.c_str(), "ihnm", 4) == 0));
 	bool is_kyra = (gameid == "kyra1");
+	bool is_samnmax = (gameid == "samnmax");
+	bool is_fw = (gameid == "fw");
+	bool is_os = (gameid == "os");
 
 	GUI_Actions::initInstanceGame();
 
 	// See if a right click mapping could be needed
-	if (is_sky || gameid == "samnmax" || is_gob)
+	if (is_sky || is_samnmax || is_gob || is_fw || is_os)
 		_right_click_needed = true;
 
 	// Initialize keys for different actions
 	// Save
 	if (is_simon || is_gob)
 		_action_enabled[SMARTPHONE_ACTION_SAVE] = false;
-	else
-	if (is_queen || is_ite) {
+	else if (is_queen || is_ite) {
 		_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
 		_key_action[SMARTPHONE_ACTION_SAVE].setAscii(286); // F1 key for FOTAQ and ITE
-	}
-	else
-	if (is_sky) {
+	} else if (is_sky) {
 		_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
 		_key_action[SMARTPHONE_ACTION_SAVE].setAscii(63);
-	}
-	else {
+	} else if (is_fw || is_os) {
 		_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
+		_key_action[SMARTPHONE_ACTION_SAVE].setAscii(291); //F10
+	} else {
+		_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
 		_key_action[SMARTPHONE_ACTION_SAVE].setAscii(319); // F5 key
 	}
 	// Skip


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





More information about the Scummvm-git-logs mailing list