thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Symbian Actions for proper ITE menu key.

Browse source 
svn-id: r26125
This commit is contained in:
Lars Persson 2007-03-13 20:47:11 +00:00
parent b0a7abb186
commit dbca9d0c47
3 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backends/platform/symbian/src/SymbianActions.cpp
View file

@ -128,8 +128,6 @@ void SymbianActions::initInstanceGame() {
bool is_comi = (strncmp(gameid.c_str(), "comi", 4) == 0);
bool is_queen = (strncmp(gameid.c_str(), "queen", 5) == 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_kyra = (gameid == "kyra1");
bool is_samnmax = (gameid == "samnmax");
bool is_cine = (gameid == "cine");
@ -138,23 +136,19 @@ void SymbianActions::initInstanceGame() {
Actions::initInstanceGame();
// See if a right click mapping could be needed
if (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_gob || is_kyra || is_touche)
if (is_simon || is_sword2 || is_gob || is_kyra || is_touche)
_action_enabled[ACTION_SAVE] = false;
else if (is_queen || is_saga || is_ite) {
else if (is_queen || is_saga) {
_action_enabled[ACTION_SAVE] = true;
_key_action[ACTION_SAVE].setAscii(SDLK_F1); // F1 key for FOTAQ and ITE
_key_action[ACTION_SAVE].setAscii(SDLK_F1); // F1 key for FOTAQ
} else if (is_sky) {
_action_enabled[ACTION_SAVE] = true;
_key_action[ACTION_SAVE].setAscii(63);
} else if (is_cine) {
_action_enabled[ACTION_SAVE] = true;
_key_action[ACTION_SAVE].setAscii(291); // F10
_key_action[ACTION_SAVE].setAscii(SDLK_F10); // F10
} else if (is_agi) {
_action_enabled[ACTION_SAVE] = true;
_key_action[ACTION_SAVE].setAscii(SDLK_ESCAPE);
@ -175,7 +169,9 @@ void SymbianActions::initInstanceGame() {
_key_action[ACTION_FT_CHEAT].setAscii(86); // shift-V
// Skip text
_action_enabled[ACTION_SKIP_TEXT] = true;
if (!is_cine)
_action_enabled[ACTION_SKIP_TEXT] = true;
if (is_queen) {
_key_action[ACTION_SKIP_TEXT].setAscii(SDLK_SPACE);
} else {

1
backends/platform/symbian/src/SymbianActions.h
View file

@ -69,7 +69,6 @@ public:
private:
SymbianActions();
bool _right_click_needed;
};
} // namespace GUI

3
backends/platform/symbian/src/SymbianOS.cpp
View file

@ -33,9 +33,6 @@
#include "ESDL/sdlapp.h" // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
////////// extern "C" ///////////////////////////////////////////////////
extern Common::ConfigManager *g_config;
namespace Symbian {
// Show a simple Symbian Info win with Msg & exit