[Scummvm-cvs-logs] SF.net SVN: scummvm:[39061] scummvm/trunk/backends/platform/wince
knakos at users.sourceforge.net
knakos at users.sourceforge.net
Sun Mar 1 23:35:17 CET 2009
Revision: 39061
http://scummvm.svn.sourceforge.net/scummvm/?rev=39061&view=rev
Author: knakos
Date: 2009-03-01 22:35:14 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
add support for tinsel engine (off by default for the time being)
Modified Paths:
--------------
scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
scummvm/trunk/backends/platform/wince/Makefile
scummvm/trunk/backends/platform/wince/README-WinCE.txt
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2009-03-01 22:19:49 UTC (rev 39060)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2009-03-01 22:35:14 UTC (rev 39061)
@@ -132,11 +132,12 @@
bool is_drascula = (strncmp(gameid.c_str(), "drascula",8) == 0);
bool is_tucker = (gameid == "tucker");
bool is_groovie = (gameid == "groovie");
+ bool is_tinsel = (gameid == "tinsel");
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 ||
+ 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)
_right_click_needed = true;
@@ -166,6 +167,9 @@
} else if (is_parallaction) {
_action_enabled[POCKET_ACTION_SAVE] = true;
_key_action[POCKET_ACTION_SAVE].setKey('s', SDLK_s);
+ } else if (is_tinsel) {
+ _action_enabled[POCKET_ACTION_SAVE] = true;
+ _key_action[POCKET_ACTION_SAVE].setKey(Common::ASCII_F1, SDLK_F1);
} else {
_action_enabled[POCKET_ACTION_SAVE] = true;
_key_action[POCKET_ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5); // F5 key
@@ -175,7 +179,7 @@
// Skip
if (!is_cine && !is_parallaction && !is_groovie)
_action_enabled[POCKET_ACTION_SKIP] = true;
- if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob ||
+ 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)
_key_action[POCKET_ACTION_SKIP].setKey(VK_ESCAPE);
else
Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp 2009-03-01 22:19:49 UTC (rev 39060)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp 2009-03-01 22:35:14 UTC (rev 39061)
@@ -122,11 +122,12 @@
bool is_drascula = (strncmp(gameid.c_str(), "drascula",8) == 0);
bool is_tucker = (gameid == "tucker");
bool is_groovie = (gameid == "groovie");
+ bool is_tinsel = (gameid == "tinsel");
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 ||
+ 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)
_right_click_needed = true;
@@ -149,13 +150,16 @@
} else if (is_parallaction) {
_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
_key_action[SMARTPHONE_ACTION_SAVE].setKey('s', SDLK_s);
+ } else if (is_tinsel) {
+ _action_enabled[SMARTPHONE_ACTION_SAVE] = true;
+ _key_action[SMARTPHONE_ACTION_SAVE].setKey(Common::ASCII_F1, SDLK_F1);
} else {
_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
_key_action[SMARTPHONE_ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5); // F5 key
}
// Skip
_action_enabled[SMARTPHONE_ACTION_SKIP] = true;
- if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob ||
+ 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)
_key_action[SMARTPHONE_ACTION_SKIP].setKey(VK_ESCAPE);
else
Modified: scummvm/trunk/backends/platform/wince/Makefile
===================================================================
--- scummvm/trunk/backends/platform/wince/Makefile 2009-03-01 22:19:49 UTC (rev 39060)
+++ scummvm/trunk/backends/platform/wince/Makefile 2009-03-01 22:35:14 UTC (rev 39061)
@@ -39,6 +39,8 @@
ENABLE_DRASCULA = STATIC_PLUGIN
ENABLE_GROOVIE = STATIC_PLUGIN
ENABLE_TUCKER = STATIC_PLUGIN
+#ENABLE_SCI = STATIC_PLUGIN
+#ENABLE_TINSEL = STATIC_PLUGIN
#ENABLE_CRUISE = STATIC_PLUGIN
#ENABLE_IGOR = STATIC_PLUGIN
#ENABLE_M4 = STATIC_PLUGIN
Modified: scummvm/trunk/backends/platform/wince/README-WinCE.txt
===================================================================
--- scummvm/trunk/backends/platform/wince/README-WinCE.txt 2009-03-01 22:19:49 UTC (rev 39060)
+++ scummvm/trunk/backends/platform/wince/README-WinCE.txt 2009-03-01 22:35:14 UTC (rev 39061)
@@ -574,6 +574,7 @@
The control scheme is awkward (Pocket PCs)
------------------------------------------
+
Map and use the 'Free Look' action. Since normal pointer operation is to
enter a left click at each tap position, the free look mode enables
'hovering' the mouse on an object, then right clicking either by using the
@@ -581,6 +582,15 @@
can be entered while in free look mode, by clicking a second time near the
current pointer's location. Note that two taps equal a left click.
+---------------
+-- Discworld --
+---------------
+
+By default, the double tap to right click action is disabled in this game
+as this interferes with the game's controls. This setting can be overridden
+(see 'no_doubletap_rightclick' parameter above).
+
+
------------------------------------------------------------------------
Support
------------------------------------------------------------------------
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-03-01 22:19:49 UTC (rev 39060)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-03-01 22:35:14 UTC (rev 39061)
@@ -1083,6 +1083,11 @@
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();
+ }
compute_sample_rate();
}
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