[Scummvm-cvs-logs] SF.net SVN: scummvm:[43034] scummvm/branches/branch-1-0-0/backends/platform /wince

[knakos at users.sourceforge.net]

Revision: 43034
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43034&view=rev
Author:   knakos
Date:     2009-08-04 12:02:37 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
add bindings for cruise engine (backport)

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsPocket.cpp
    scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsSmartphone.cpp
    scummvm/branches/branch-1-0-0/backends/platform/wince/wince-sdl.cpp

Modified: scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsPocket.cpp	2009-08-04 12:02:07 UTC (rev 43033)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsPocket.cpp	2009-08-04 12:02:37 UTC (rev 43034)
@@ -133,12 +133,13 @@
 	bool is_tucker = (gameid == "tucker");
 	bool is_groovie = (gameid == "groovie");
 	bool is_tinsel = (gameid == "tinsel");
+	bool is_cruise = (gameid == "cruise");
 
 	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 || is_tinsel ||
-			is_samnmax || is_cine || is_touche || is_parallaction || is_drascula)
+			is_samnmax || is_cine || is_touche || is_parallaction || is_drascula || is_cruise)
 		_right_click_needed = true;
 
 	// See if a "hide toolbar" mapping could be needed
@@ -158,7 +159,7 @@
 	} else if (is_sky) {
 		_action_enabled[POCKET_ACTION_SAVE] = true;
 		_key_action[POCKET_ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5);
-	} else if (is_cine || is_drascula) {
+	} else if (is_cine || is_drascula || is_cruise) {
 		_action_enabled[POCKET_ACTION_SAVE] = true;
 		_key_action[POCKET_ACTION_SAVE].setKey(Common::ASCII_F10, SDLK_F10); // F10
 	} else if (is_agi) {
@@ -177,7 +178,7 @@
 	// Quit
 	_action_enabled[POCKET_ACTION_QUIT] = true;
 	// Skip
-	if (!is_cine && !is_parallaction && !is_groovie)
+	if (!is_cine && !is_parallaction && !is_groovie && !is_cruise)
 		_action_enabled[POCKET_ACTION_SKIP] = true;
 	if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_tinsel ||
 			is_saga || is_kyra || is_touche || is_lure || is_feeble || is_drascula || is_tucker)
@@ -214,6 +215,12 @@
 		_key_action[POCKET_ACTION_MULTI].setKey('V', SDLK_v, KMOD_SHIFT); // FT cheat : shift-V
 	// Key bind method
 	_action_enabled[POCKET_ACTION_BINDKEYS] = true;
+	// Disable double-tap right-click for convenience
+	if (is_tinsel || is_cruise)
+		if (!ConfMan.hasKey("no_doubletap_rightclick")) {
+			ConfMan.setBool("no_doubletap_rightclick", true);
+			ConfMan.flushToDisk();
+		}
 }
 
 

Modified: scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsSmartphone.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsSmartphone.cpp	2009-08-04 12:02:07 UTC (rev 43033)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/CEActionsSmartphone.cpp	2009-08-04 12:02:37 UTC (rev 43034)
@@ -123,12 +123,13 @@
 	bool is_tucker = (gameid == "tucker");
 	bool is_groovie = (gameid == "groovie");
 	bool is_tinsel = (gameid == "tinsel");
+	bool is_cruise = (gameid == "cruise");
 
 	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 || is_tinsel ||
-			is_samnmax || is_cine || is_touche || is_parallaction || is_drascula)
+			is_samnmax || is_cine || is_touche || is_parallaction || is_drascula || is_cruise)
 		_right_click_needed = true;
 
 	// Initialize keys for different actions
@@ -141,7 +142,7 @@
 	} else if (is_sky) {
 		_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
 		_key_action[SMARTPHONE_ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5);
-	} else if (is_cine || is_drascula) {
+	} else if (is_cine || is_drascula || is_cruise) {
 		_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
 		_key_action[SMARTPHONE_ACTION_SAVE].setKey(Common::ASCII_F10, SDLK_F10); //F10
 	} else if (is_agi) {
@@ -160,7 +161,8 @@
 	// Skip
 	_action_enabled[SMARTPHONE_ACTION_SKIP] = true;
 	if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_tinsel ||
-			is_saga || is_kyra || is_touche || is_lure || is_feeble || is_drascula || is_tucker || is_groovie)
+			is_saga || is_kyra || is_touche || is_lure || is_feeble || is_drascula || is_tucker ||
+			is_groovie || is_cruise)
 		_key_action[SMARTPHONE_ACTION_SKIP].setKey(VK_ESCAPE);
 	else
 		_key_action[SMARTPHONE_ACTION_SKIP].setKey(KEY_ALL_SKIP);
@@ -178,6 +180,12 @@
 		_key_action[SMARTPHONE_ACTION_MULTI].setKey('V', SDLK_v, KMOD_SHIFT); // FT cheat : shift-V
 	// Bind keys
 	_action_enabled[SMARTPHONE_ACTION_BINDKEYS] = true;
+	// Disable double-tap right-click for convenience
+	if (is_tinsel || is_cruise)
+		if (!ConfMan.hasKey("no_doubletap_rightclick")) {
+			ConfMan.setBool("no_doubletap_rightclick", true);
+			ConfMan.flushToDisk();
+		}
 }
 
 

Modified: scummvm/branches/branch-1-0-0/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/wince-sdl.cpp	2009-08-04 12:02:07 UTC (rev 43033)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/wince-sdl.cpp	2009-08-04 12:02:37 UTC (rev 43034)
@@ -1082,11 +1082,6 @@
 
 	if (ConfMan.hasKey("no_doubletap_rightclick"))
 		_noDoubleTapRMB = ConfMan.getBool("no_doubletap_rightclick");
-	else if (gameid == "tinsel") {
-		_noDoubleTapRMB = true;
-		ConfMan.setBool("no_doubletap_rightclick", true);
-		ConfMan.flushToDisk();
-	}
 }
 
 void OSystem_WINCE3::initSize(uint w, uint h) {


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