aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostas Nakos2007-02-27 11:07:59 +0000
committerKostas Nakos2007-02-27 11:07:59 +0000
commit235aa3376bdd164d7f1426ad7e683479283d405d (patch)
tree1a3873d5431a48b9dcb8381450cc5942d242754c
parent2c7bf36af8c351e207a5e1a7e29a3e4a211d70ff (diff)
downloadscummvm-rg350-235aa3376bdd164d7f1426ad7e683479283d405d.tar.gz
scummvm-rg350-235aa3376bdd164d7f1426ad7e683479283d405d.tar.bz2
scummvm-rg350-235aa3376bdd164d7f1426ad7e683479283d405d.zip
properly support saga and cine engines
svn-id: r25893
-rw-r--r--backends/platform/wince/CEActionsPocket.cpp16
-rw-r--r--backends/platform/wince/CEActionsSmartphone.cpp14
2 files changed, 13 insertions, 17 deletions
diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp
index a264a52c58..ba4a082f58 100644
--- a/backends/platform/wince/CEActionsPocket.cpp
+++ b/backends/platform/wince/CEActionsPocket.cpp
@@ -122,19 +122,17 @@ void CEActionsPocket::initInstanceGame() {
bool is_sky = (gameid == "sky");
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));
+ bool is_saga = (gameid == "saga");
bool is_kyra = (gameid == "kyra1");
bool is_samnmax = (gameid == "samnmax");
- bool is_fw = (gameid == "fw");
- bool is_os = (gameid == "os");
+ bool is_cine = (gameid == "cine");
bool is_touche = (gameid == "touche");
bool is_agi = (gameid == "agi");
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 || is_touche)
+ if (is_sword1 || is_sword2 || is_sky || is_queen || is_comi || is_gob || is_samnmax || is_cine || is_touche)
_right_click_needed = true;
// See if a "hide toolbar" mapping could be needed
@@ -148,13 +146,13 @@ void CEActionsPocket::initInstanceGame() {
// Save
if (is_simon || is_sword2 || is_gob || is_kyra || is_touche)
_action_enabled[POCKET_ACTION_SAVE] = false;
- else if (is_queen || is_ite) {
+ else if (is_queen || is_saga) {
_action_enabled[POCKET_ACTION_SAVE] = true;
_key_action[POCKET_ACTION_SAVE].setAscii(286); // F5 key for FOTAQ & ITE
} else if (is_sky) {
_action_enabled[POCKET_ACTION_SAVE] = true;
_key_action[POCKET_ACTION_SAVE].setAscii(63);
- } else if (is_fw || is_os) {
+ } else if (is_cine) {
_action_enabled[POCKET_ACTION_SAVE] = true;
_key_action[POCKET_ACTION_SAVE].setAscii(291); // F10
} else if (is_agi) {
@@ -167,9 +165,9 @@ void CEActionsPocket::initInstanceGame() {
// Quit
_action_enabled[POCKET_ACTION_QUIT] = true;
// Skip
- if (!is_fw && !is_os)
+ if (!is_cine)
_action_enabled[POCKET_ACTION_SKIP] = true;
- if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_ite || is_kyra || is_touche)
+ if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_saga || is_kyra || is_touche)
_key_action[POCKET_ACTION_SKIP].setAscii(VK_ESCAPE);
else
_key_action[POCKET_ACTION_SKIP].setAscii(KEY_ALL_SKIP);
diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp
index 0e761a55c5..736856e666 100644
--- a/backends/platform/wince/CEActionsSmartphone.cpp
+++ b/backends/platform/wince/CEActionsSmartphone.cpp
@@ -125,32 +125,30 @@ void CEActionsSmartphone::initInstanceGame() {
bool is_sky = (gameid == "sky");
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));
+ bool is_saga = (gameid == "saga");
bool is_kyra = (gameid == "kyra1");
bool is_samnmax = (gameid == "samnmax");
- bool is_fw = (gameid == "fw");
- bool is_os = (gameid == "os");
+ bool is_cine = (gameid == "cine");
bool is_touche = (gameid == "touche");
bool is_agi = (gameid == "agi");
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 || is_touche)
+ if (is_sword1 || is_sword2 || is_sky || is_queen || is_comi || is_gob || is_samnmax || is_cine || is_touche)
_right_click_needed = true;
// Initialize keys for different actions
// Save
if (is_simon || is_sword2 || is_gob || is_kyra || is_touche)
_action_enabled[SMARTPHONE_ACTION_SAVE] = false;
- else if (is_queen || is_ite) {
+ else if (is_queen || is_saga) {
_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
_key_action[SMARTPHONE_ACTION_SAVE].setAscii(286); // F1 key for FOTAQ and ITE
} else if (is_sky) {
_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
_key_action[SMARTPHONE_ACTION_SAVE].setAscii(63);
- } else if (is_fw || is_os) {
+ } else if (is_cine) {
_action_enabled[SMARTPHONE_ACTION_SAVE] = true;
_key_action[SMARTPHONE_ACTION_SAVE].setAscii(291); //F10
} else if (is_agi) {
@@ -162,7 +160,7 @@ void CEActionsSmartphone::initInstanceGame() {
}
// Skip
_action_enabled[SMARTPHONE_ACTION_SKIP] = true;
- if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_ite || is_kyra || is_touche)
+ if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_saga || is_kyra || is_touche)
_key_action[SMARTPHONE_ACTION_SKIP].setAscii(VK_ESCAPE);
else
_key_action[SMARTPHONE_ACTION_SKIP].setAscii(KEY_ALL_SKIP);