From dbca9d0c4787eae76846c738e4a958a97bd860bd Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Tue, 13 Mar 2007 20:47:11 +0000
Subject: Updated Symbian Actions for proper ITE menu key.

svn-id: r26125
---
 backends/platform/symbian/src/SymbianActions.cpp | 18 +++++++-----------
 backends/platform/symbian/src/SymbianActions.h   |  1 -
 backends/platform/symbian/src/SymbianOS.cpp      |  3 ---
 3 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index f5fcd08de0..cd52a9b5ec 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -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 {
diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h
index 5f435d5912..139bf79018 100644
--- a/backends/platform/symbian/src/SymbianActions.h
+++ b/backends/platform/symbian/src/SymbianActions.h
@@ -69,7 +69,6 @@ public:
 
 private:
 	SymbianActions();
-	bool _right_click_needed;
 };
 
 } // namespace GUI
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 9c51347c3b..f1f26cb51b 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -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
-- 
cgit v1.2.3