aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bacca2002-05-14 06:47:06 +0000
committerNicolas Bacca2002-05-14 06:47:06 +0000
commita3e7a74e0702608100dc2b45fad8511e166eadf5 (patch)
treef7e57bdb95a36b25e14f942005cf41e3ca59ec18
parent02b6003c5a8cc7f9c2e5aed62a7258edf194fd0d (diff)
downloadscummvm-rg350-a3e7a74e0702608100dc2b45fad8511e166eadf5.tar.gz
scummvm-rg350-a3e7a74e0702608100dc2b45fad8511e166eadf5.tar.bz2
scummvm-rg350-a3e7a74e0702608100dc2b45fad8511e166eadf5.zip
Mapped new action to remove subtitles on WinCE
svn-id: r4309
-rw-r--r--gapi_keys.h5
-rw-r--r--wince/gapi_keys.cpp9
2 files changed, 10 insertions, 4 deletions
diff --git a/gapi_keys.h b/gapi_keys.h
index 716011c807..5eee52e518 100644
--- a/gapi_keys.h
+++ b/gapi_keys.h
@@ -12,7 +12,8 @@ enum ActionType {
ACTION_KEYBOARD = 6,
ACTION_SOUND = 7,
ACTION_RIGHTCLICK = 8,
- ACTION_CURSOR = 9
+ ACTION_CURSOR = 9,
+ ACTION_SUBTITLES = 10
};
struct oneAction {
@@ -22,7 +23,7 @@ struct oneAction {
#define NUMBER_ACTIONS 10
-#define TOTAL_ACTIONS 9
+#define TOTAL_ACTIONS 10
#define GAPI_KEY_BASE 1000
#define GAPI_KEY_VKA 1
diff --git a/wince/gapi_keys.cpp b/wince/gapi_keys.cpp
index a9882c04e0..15612d2a73 100644
--- a/wince/gapi_keys.cpp
+++ b/wince/gapi_keys.cpp
@@ -27,7 +27,8 @@ const char* ActionsText[] = {
"Keyboard",
"Sound",
"Right click",
- "Cursor on/off"
+ "Cursor on/off",
+ "Subtitles on/off"
};
bool _typeExists(int x) {
@@ -65,11 +66,15 @@ void GAPIKeysInit(pAction *functions) {
}
void GAPIKeysGetReference() {
+ /*
if(GetScreenMode()) {
_keys = GXGetDefaultKeys(GX_LANDSCAPEKEYS);
} else {
_keys = GXGetDefaultKeys(GX_NORMALKEYS);
}
+ */
+
+ _keys = GXGetDefaultKeys(GX_LANDSCAPEKEYS);
}
const unsigned char getGAPIKeyMapping(short key) {
@@ -86,7 +91,7 @@ const unsigned char getGAPIKeyMapping(short key) {
if (key == _keys.vkStart)
return GAPI_KEY_VKSTART;
- if (key == _keys.vkUp)
+ if (key == _keys.vkUp)
return GAPI_KEY_VKUP;
if (key == _keys.vkDown)