[Scummvm-cvs-logs] CVS: scummvm/backends/wince CEActions.cpp,1.2,1.3 CEActions.h,1.1,1.2

Nicolas Bacca arisme at users.sourceforge.net
Tue Jan 27 17:15:31 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24663

Modified Files:
	CEActions.cpp CEActions.h 
Log Message:
Add needsHideToolbarMapping

Index: CEActions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEActions.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CEActions.cpp	26 Jan 2004 20:30:10 -0000	1.2
+++ CEActions.cpp	28 Jan 2004 01:06:29 -0000	1.3
@@ -57,7 +57,9 @@
 }
 
 CEActions::CEActions(OSystem_WINCE3 *mainSystem, GameDetector &detector) :
-	_mainSystem(mainSystem), _mapping_active(false), _right_click_needed(false) {
+	_mainSystem(mainSystem), _mapping_active(false), _right_click_needed(false),
+	_hide_toolbar_needed(false) 
+{
 	int i;
 	bool is_simon = (strcmp(detector._targetName.c_str(), "simon") == 0);
 	bool is_sword1 = (detector._targetName == "sword1");
@@ -73,6 +75,10 @@
 		detector._targetName == "samnmax")
 		_right_click_needed = true;
 
+	// See if a "hide toolbar" mapping could be needed
+	if (is_sword1 || is_sword2 || is_queen)
+		_hide_toolbar_needed = true;
+
 	// Initialize keys for different actions
 	// Pause
 	_key_action[ACTION_PAUSE].setAscii(VK_SPACE);
@@ -247,4 +253,11 @@
 		return (_action_mapping[ACTION_RIGHTCLICK] == 0);
 }
 
-CEActions *CEActions::_instance = NULL;
\ No newline at end of file
+bool CEActions::needsHideToolbarMapping() {
+	if (!_hide_toolbar_needed)
+		return false;
+	else
+		return (_action_mapping[ACTION_HIDE] == 0);
+}
+
+CEActions *CEActions::_instance = NULL;    
\ No newline at end of file

Index: CEActions.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEActions.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CEActions.h	26 Jan 2004 08:20:26 -0000	1.1
+++ CEActions.h	28 Jan 2004 01:06:29 -0000	1.2
@@ -74,6 +74,7 @@
 
 		// Utility
 		bool needsRightClickMapping();
+		bool needsHideToolbarMapping();
 
 		~CEActions();
 	private:
@@ -86,6 +87,7 @@
 		unsigned int _action_mapping[ACTION_LAST];
 		bool _mapping_active;
 		bool _right_click_needed;
+		bool _hide_toolbar_needed;
 	};	
 
 #endif
\ No newline at end of file





More information about the Scummvm-git-logs mailing list