[Scummvm-cvs-logs] SF.net SVN: scummvm: [25830] scummvm/trunk/backends/platform/wince
knakos at users.sourceforge.net
knakos at users.sourceforge.net
Sat Feb 24 21:50:56 CET 2007
Revision: 25830
http://scummvm.svn.sourceforge.net/scummvm/?rev=25830&view=rev
Author: knakos
Date: 2007-02-24 12:50:56 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
Add support for touche engine.
Also, since QVGA smartphones can run any game, updated the action mappings to account for all of them.
Modified Paths:
--------------
scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2007-02-24 19:54:54 UTC (rev 25829)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2007-02-24 20:50:56 UTC (rev 25830)
@@ -128,11 +128,12 @@
bool is_samnmax = (gameid == "samnmax");
bool is_fw = (gameid == "fw");
bool is_os = (gameid == "os");
+ bool is_touche = (gameid == "touche");
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_samnmax || is_fw || is_os)
+ if (is_sword1 || is_sword2 || is_sky || is_queen || is_comi || is_gob || is_samnmax || is_fw || is_os || is_touche)
_right_click_needed = true;
// See if a "hide toolbar" mapping could be needed
@@ -144,7 +145,7 @@
_key_action[POCKET_ACTION_PAUSE].setAscii(VK_SPACE);
_action_enabled[POCKET_ACTION_PAUSE] = true;
// Save
- if (is_simon || is_sword2 || is_gob || is_kyra)
+ if (is_simon || is_sword2 || is_gob || is_kyra || is_touche)
_action_enabled[POCKET_ACTION_SAVE] = false;
else if (is_queen || is_ite) {
_action_enabled[POCKET_ACTION_SAVE] = true;
@@ -164,7 +165,7 @@
// Skip
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)
+ if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_ite || is_kyra || is_touche)
_key_action[POCKET_ACTION_SKIP].setAscii(VK_ESCAPE);
else
_key_action[POCKET_ACTION_SKIP].setAscii(KEY_ALL_SKIP);
Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp 2007-02-24 19:54:54 UTC (rev 25829)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp 2007-02-24 20:50:56 UTC (rev 25830)
@@ -119,8 +119,11 @@
void CEActionsSmartphone::initInstanceGame() {
String gameid(ConfMan.get("gameid"));
bool is_simon = (strncmp(gameid.c_str(), "simon", 5) == 0);
+ bool is_sword1 = (gameid == "sword1");
+ bool is_sword2 = (strcmp(gameid.c_str(), "sword2") == 0);
+ bool is_queen = (gameid == "queen");
bool is_sky = (gameid == "sky");
- bool is_queen = (gameid == "queen");
+ bool is_comi = (strncmp(gameid.c_str(), "comi", 4) == 0);
bool is_gob = (strncmp(gameid.c_str(), "gob", 3) == 0);
bool is_ite = ((strncmp(gameid.c_str(), "ite", 3) == 0) ||
(strncmp(gameid.c_str(), "ihnm", 4) == 0));
@@ -128,16 +131,17 @@
bool is_samnmax = (gameid == "samnmax");
bool is_fw = (gameid == "fw");
bool is_os = (gameid == "os");
+ bool is_touche = (gameid == "touche");
GUI_Actions::initInstanceGame();
// See if a right click mapping could be needed
- if (is_sky || is_samnmax || is_gob || is_fw || is_os)
+ if (is_sword1 || is_sword2 || is_sky || is_queen || is_comi || is_gob || is_samnmax || is_fw || is_os || is_touche)
_right_click_needed = true;
// Initialize keys for different actions
// Save
- if (is_simon || is_gob)
+ if (is_simon || is_sword2 || is_gob || is_kyra || is_touche)
_action_enabled[SMARTPHONE_ACTION_SAVE] = false;
else if (is_queen || is_ite) {
_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
@@ -154,7 +158,7 @@
}
// Skip
_action_enabled[SMARTPHONE_ACTION_SKIP] = true;
- if (is_simon || is_sky || is_gob || is_ite || is_kyra)
+ if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_ite || is_kyra || is_touche)
_key_action[SMARTPHONE_ACTION_SKIP].setAscii(VK_ESCAPE);
else
_key_action[SMARTPHONE_ACTION_SKIP].setAscii(KEY_ALL_SKIP);
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2007-02-24 19:54:54 UTC (rev 25829)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2007-02-24 20:50:56 UTC (rev 25830)
@@ -1173,6 +1173,8 @@
// Always use full screen mode to have a "clean screen"
displayWidth = _screenWidth * _scaleFactorXm / _scaleFactorXd;
displayHeight = _screenHeight * _scaleFactorYm / _scaleFactorYd;
+ if (_screenHeight == 400) // touche engine fixup
+ displayHeight += 80 * _scaleFactorYm / _scaleFactorYd;
// FIXME
if (displayWidth <= GetSystemMetrics(SM_CXSCREEN)) { // no rotation
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