[Scummvm-cvs-logs] SF.net SVN: scummvm: [26125] scummvm/trunk/backends/platform/symbian/src

[anotherguest at users.sourceforge.net]

Revision: 26125
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26125&view=rev
Author:   anotherguest
Date:     2007-03-13 13:47:11 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
Updated Symbian Actions for proper ITE menu key.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianActions.h
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2007-03-13 20:42:11 UTC (rev 26124)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2007-03-13 20:47:11 UTC (rev 26125)
@@ -128,8 +128,6 @@
 	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 @@
 	
 	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 @@
 	_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 {

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.h	2007-03-13 20:42:11 UTC (rev 26124)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.h	2007-03-13 20:47:11 UTC (rev 26125)
@@ -69,7 +69,6 @@
 
 private:
 	SymbianActions();
-	bool _right_click_needed;
 };
 
 } // namespace GUI

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-03-13 20:42:11 UTC (rev 26124)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-03-13 20:47:11 UTC (rev 26125)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.