[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.18.2.5,1.18.2.6 CEKeysDialog.cpp,1.2,1.2.2.1

[Nicolas Bacca]

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

Modified Files:
      Tag: branch-0-7-0
	wince-sdl.cpp CEKeysDialog.cpp 
Log Message:
Fix first key mapping & Smartphone Zone action

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -d -r1.18.2.5 -r1.18.2.6
--- wince-sdl.cpp	10 Jan 2005 20:43:15 -0000	1.18.2.5
+++ wince-sdl.cpp	10 Jan 2005 22:34:12 -0000	1.18.2.6
@@ -228,6 +228,7 @@
 		loadSmartphoneConfiguration();
 	}
 
+
 }
 
 void OSystem_WINCE3::swap_panel_visibility() {
@@ -345,8 +346,8 @@
 
 		_currentZone = 0;
         for (i=0; i<TOTAL_ZONES; i++) {
-                _mouseXZone[i] = _zones[i].x + (_zones[i].width / 2);
-                _mouseYZone[i] = _zones[i].y + (_zones[i].height / 2);
+                _mouseXZone[i] = (_zones[i].x + (_zones[i].width / 2)) * _scaleFactorXm / _scaleFactorXd;
+                _mouseYZone[i] = (_zones[i].y + (_zones[i].height / 2)) * _scaleFactorYm / _scaleFactorYd;
         }
 }
 
@@ -822,6 +823,7 @@
 		_scaleFactorYd = 8;
 		_scalerProc = SmartphoneLandscape;
 		_modeFlags = 0;
+		initZones();
 		return true;
 	}
 //#endif

Index: CEKeysDialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEKeysDialog.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- CEKeysDialog.cpp	9 May 2004 14:54:02 -0000	1.2
+++ CEKeysDialog.cpp	10 Jan 2005 22:34:12 -0000	1.2.2.1
@@ -56,7 +56,7 @@
 	// Get actions names
 	Common::StringList l;
 
-	for (int i = 1; i < CEActions::Instance()->size(); i++) 
+	for (int i = 0; i < CEActions::Instance()->size(); i++) 
 		l.push_back(CEActions::Instance()->actionName((ActionType)i));
 
 	_actionsList->setList(l);
@@ -72,7 +72,7 @@
 		if (_actionsList->getSelected() >= 0) {
 				char selection[100];
 
-				sprintf(selection, "Associated key : %s", CEDevice::getKeyName(CEActions::Instance()->getMapping((ActionType)(_actionsList->getSelected() + 1))).c_str());
+				sprintf(selection, "Associated key : %s", CEDevice::getKeyName(CEActions::Instance()->getMapping((ActionType)(_actionsList->getSelected()))).c_str());
 				_keyMapping->setLabel(selection);
 				_keyMapping->draw();
 		}
@@ -84,7 +84,7 @@
 		else {
 				char selection[100];
 
-				_actionSelected = _actionsList->getSelected() + 1;
+				_actionSelected = _actionsList->getSelected();
 				sprintf(selection, "Associated key : %s", CEDevice::getKeyName(CEActions::Instance()->getMapping((ActionType)_actionSelected)).c_str());
 				_actionTitle->setLabel("Press the key to associate");
 				_keyMapping->setLabel(selection);