diff options
| author | Lars Persson | 2007-03-11 11:23:40 +0000 |
|---|---|---|
| committer | Lars Persson | 2007-03-11 11:23:40 +0000 |
| commit | 61690d4daf0aeb468c17581ab3c207089dc5c660 (patch) | |
| tree | 0dbaaf8d798155c6c46360cc0419a990cf48c502 | |
| parent | 555d3ed3170667ef04c43bf57ac7ce0f7f51fe8d (diff) | |
| download | scummvm-rg350-61690d4daf0aeb468c17581ab3c207089dc5c660.tar.gz scummvm-rg350-61690d4daf0aeb468c17581ab3c207089dc5c660.tar.bz2 scummvm-rg350-61690d4daf0aeb468c17581ab3c207089dc5c660.zip | |
Updated actions for symbian OS, memory limits for S60.
svn-id: r26082
| -rw-r--r-- | backends/platform/symbian/S60/ScummVM_S60.mmp.in | 2 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianActions.cpp | 18 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 4 |
3 files changed, 19 insertions, 5 deletions
diff --git a/backends/platform/symbian/S60/ScummVM_S60.mmp.in b/backends/platform/symbian/S60/ScummVM_S60.mmp.in index c78635253c..d65aa88423 100644 --- a/backends/platform/symbian/S60/ScummVM_S60.mmp.in +++ b/backends/platform/symbian/S60/ScummVM_S60.mmp.in @@ -39,7 +39,7 @@ OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way #if !defined(WINS) EPOCSTACKSIZE 0x00008000 -EPOCHEAPSIZE 2048000 161920000 +EPOCHEAPSIZE 2048000 32000000 #endif MACRO S60 diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index b8caaa2a01..f5fcd08de0 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -124,28 +124,40 @@ void SymbianActions::initInstanceGame() { Common::String gameid(ConfMan.get("gameid")); bool is_simon = (strncmp(gameid.c_str(), "simon", 5) == 0); bool is_sky = (strncmp(gameid.c_str(), "sky", 3) == 0); + bool is_saga = (gameid == "saga"); + 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"); + bool is_touche = (gameid == "touche"); + bool is_agi = (gameid == "agi"); Actions::initInstanceGame(); // See if a right click mapping could be needed - if (is_sky || gameid == "samnmax" || is_gob) + 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) + if (is_simon || is_gob || is_kyra || is_touche) _action_enabled[ACTION_SAVE] = false; - else if (is_queen || is_ite) { + else if (is_queen || is_saga || is_ite) { _action_enabled[ACTION_SAVE] = true; _key_action[ACTION_SAVE].setAscii(SDLK_F1); // F1 key for FOTAQ and ITE } 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 + } else if (is_agi) { + _action_enabled[ACTION_SAVE] = true; + _key_action[ACTION_SAVE].setAscii(SDLK_ESCAPE); } else { _action_enabled[ACTION_SAVE] = true; _key_action[ACTION_SAVE].setAscii(SDLK_F5); // F5 key diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 3e615e4cc8..f469125981 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -43,8 +43,10 @@ void FatalError(const char *msg) { TPtrC8 msgPtr((const TUint8 *)msg); TBuf<512> msg16Bit; msg16Bit.Copy(msgPtr); +#ifdef S60 +#else CEikonEnv::Static()->InfoWinL(_L("ScummVM Fatal Error"), msg16Bit); - +#endif if (g_system) g_system->quit(); } |