From e35ba53b7e358e1ba4f29a9d0af75dee78f7acc9 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Thu, 7 Jun 2007 20:52:49 +0000 Subject: Symbian PORT updated with CE mappings svn-id: r27178 --- backends/platform/symbian/src/SymbianActions.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'backends/platform/symbian/src/SymbianActions.cpp') diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index cb2652eac4..2c67c06bba 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -47,7 +47,7 @@ const Common::String actionNames[] = { "Save", "Skip", "Zone", - "FT Cheat", + "Multi Function", "Swap character", "Skip text", "Pause", @@ -174,8 +174,11 @@ void SymbianActions::initInstanceGame() { _action_enabled[ACTION_ZONE] = true; // FT Cheat - _action_enabled[ACTION_FT_CHEAT] = true; - _key_action[ACTION_FT_CHEAT].setAscii(86); // shift-V + _action_enabled[ACTION_MULTI] = true; + if (is_agi) + _key_action[ACTION_MULTI].setAscii(SDLK_PAUSE); + else + _key_action[ACTION_MULTI].setAscii(86); // shift-V // Enable debugger _action_enabled[ACTION_DEBUGGER] = true; -- cgit v1.2.3 From e1fbe5f02f0ebb26f3ca1e1710e581471f3c47bc Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Fri, 8 Jun 2007 20:41:35 +0000 Subject: Updated actions for SymbianOS svn-id: r27215 --- backends/platform/symbian/src/SymbianActions.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'backends/platform/symbian/src/SymbianActions.cpp') diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 2c67c06bba..1b2e4e6aac 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -176,9 +176,13 @@ void SymbianActions::initInstanceGame() { // FT Cheat _action_enabled[ACTION_MULTI] = true; if (is_agi) - _key_action[ACTION_MULTI].setAscii(SDLK_PAUSE); + _key_action[ACTION_MULTI].setAscii(SDLK_PAUSE); // agi: show predictive dialog + else if (is_gob) + _key_action[ACTION_MULTI].setAscii(315); // bargon : F1 to start + else if (gameid == "atlantis") + _key_action[ACTION_MULTI].setAscii(SDLK_KP0); // fate of atlantis : Ins to sucker-punch else - _key_action[ACTION_MULTI].setAscii(86); // shift-V + _key_action[ACTION_MULTI].setAscii(86); // FT cheat : shift-V // Enable debugger _action_enabled[ACTION_DEBUGGER] = true; -- cgit v1.2.3 From 62ca2f9d51543be39489977bc1f541f665e21156 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Sat, 9 Jun 2007 21:13:47 +0000 Subject: Updated actions for paralall svn-id: r27256 --- backends/platform/symbian/src/SymbianActions.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'backends/platform/symbian/src/SymbianActions.cpp') diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 1b2e4e6aac..2c13a407ed 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -138,7 +138,8 @@ void SymbianActions::initInstanceGame() { bool is_cine = (gameid == "cine"); bool is_touche = (gameid == "touche"); bool is_agi = (gameid == "agi"); - + bool is_parallaction = (gameid == "parallaction"); + Actions::initInstanceGame(); // Initialize keys for different actions @@ -156,6 +157,8 @@ void SymbianActions::initInstanceGame() { _key_action[ACTION_SAVE].setAscii(SDLK_F10); // F10 } else if (is_agi) { _key_action[ACTION_SAVE].setAscii(SDLK_ESCAPE); + } else if (is_parallaction) { + _key_action[ACTION_SAVE].setAscii(SDLK_s); } else { _key_action[ACTION_SAVE].setAscii(SDLK_F5); // F5 key } @@ -173,7 +176,7 @@ void SymbianActions::initInstanceGame() { // Zone _action_enabled[ACTION_ZONE] = true; - // FT Cheat + // Multi function key _action_enabled[ACTION_MULTI] = true; if (is_agi) _key_action[ACTION_MULTI].setAscii(SDLK_PAUSE); // agi: show predictive dialog -- cgit v1.2.3 From f97cbb8294eb35fbd3af38fbe37ac35a82c64121 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 23 Jun 2007 00:05:32 +0000 Subject: Update GUI::Key constructs svn-id: r27643 --- backends/platform/symbian/src/SymbianActions.cpp | 36 +++++++++++------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'backends/platform/symbian/src/SymbianActions.cpp') diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 2c13a407ed..3809253032 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -122,7 +122,7 @@ void SymbianActions::initInstanceMain(OSystem *mainSystem) { // Skip _action_enabled[ACTION_SKIP] = true; - _key_action[ACTION_SKIP].setAscii(SDLK_ESCAPE); + _key_action[ACTION_SKIP].setKey(SDLK_ESCAPE); } void SymbianActions::initInstanceGame() { @@ -150,28 +150,27 @@ void SymbianActions::initInstanceGame() { _action_enabled[ACTION_SAVE] = true; if (is_queen) { - _key_action[ACTION_SAVE].setAscii(SDLK_F1); // F1 key for FOTAQ + _key_action[ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5); // F1 key for FOTAQ } else if (is_sky) { - _key_action[ACTION_SAVE].setAscii(63); + _key_action[ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5); } else if (is_cine) { - _key_action[ACTION_SAVE].setAscii(SDLK_F10); // F10 + _key_action[ACTION_SAVE].setKey(Common::ASCII_F10, SDLK_F10); // F10 } else if (is_agi) { - _key_action[ACTION_SAVE].setAscii(SDLK_ESCAPE); + _key_action[ACTION_SAVE].setKey(Common::ASCII_ESCAPE, SDLK_ESCAPE); } else if (is_parallaction) { - _key_action[ACTION_SAVE].setAscii(SDLK_s); + _key_action[ACTION_SAVE].setKey('s', SDLK_s); } else { - _key_action[ACTION_SAVE].setAscii(SDLK_F5); // F5 key + _key_action[ACTION_SAVE].setKey(Common::ASCII_F5, SDLK_F5); // F5 key } } // Enable fast mode _action_enabled[ACTION_FASTMODE] = true; - _key_action[ACTION_FASTMODE].setAscii('f'); - _key_action[ACTION_FASTMODE].setFlags(KMOD_CTRL); + _key_action[ACTION_FASTMODE].setKey('f', SDLK_f, KMOD_CTRL); // Swap character _action_enabled[ACTION_SWAPCHAR] = true; - _key_action[ACTION_SWAPCHAR].setAscii('b'); // b + _key_action[ACTION_SWAPCHAR].setKey('b'); // b // Zone _action_enabled[ACTION_ZONE] = true; @@ -179,31 +178,30 @@ void SymbianActions::initInstanceGame() { // Multi function key _action_enabled[ACTION_MULTI] = true; if (is_agi) - _key_action[ACTION_MULTI].setAscii(SDLK_PAUSE); // agi: show predictive dialog + _key_action[ACTION_MULTI].setKey(SDLK_PAUSE); // agi: show predictive dialog else if (is_gob) - _key_action[ACTION_MULTI].setAscii(315); // bargon : F1 to start + _key_action[ACTION_MULTI].setKey(Common::ASCII_F1, SDLK_F1); // bargon : F1 to start else if (gameid == "atlantis") - _key_action[ACTION_MULTI].setAscii(SDLK_KP0); // fate of atlantis : Ins to sucker-punch + _key_action[ACTION_MULTI].setKey(0, SDLK_KP0); // fate of atlantis : Ins to sucker-punch else - _key_action[ACTION_MULTI].setAscii(86); // FT cheat : shift-V + _key_action[ACTION_MULTI].setKey('V', SDLK_v, KMOD_SHIFT); // FT cheat : shift-V // Enable debugger _action_enabled[ACTION_DEBUGGER] = true; - _key_action[ACTION_DEBUGGER].setAscii('d'); - _key_action[ACTION_DEBUGGER].setFlags(KMOD_CTRL); + _key_action[ACTION_DEBUGGER].setKey('d', SDLK_d, KMOD_CTRL); // Skip text if (!is_cine) _action_enabled[ACTION_SKIP_TEXT] = true; if (is_queen) { - _key_action[ACTION_SKIP_TEXT].setAscii(SDLK_SPACE); + _key_action[ACTION_SKIP_TEXT].setKey(SDLK_SPACE); } else { - _key_action[ACTION_SKIP_TEXT].setAscii(SDLK_PERIOD); + _key_action[ACTION_SKIP_TEXT].setKey(SDLK_PERIOD); } // Pause - _key_action[ACTION_PAUSE].setAscii(' '); + _key_action[ACTION_PAUSE].setKey(' '); _action_enabled[ACTION_PAUSE] = true; // Quit -- cgit v1.2.3