[Scummvm-cvs-logs] CVS: scummvm/backends/wince CEDevice.cpp,1.2,1.2.2.1 wince-sdl.cpp,1.4.2.2,1.4.2.3

[Nicolas Bacca]

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

Modified Files:
      Tag: branch-0-6-0
	CEDevice.cpp wince-sdl.cpp 
Log Message:
Random 640x480 tweaks

Index: CEDevice.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEDevice.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- CEDevice.cpp	13 Feb 2004 12:11:14 -0000	1.2
+++ CEDevice.cpp	24 Feb 2004 22:15:54 -0000	1.2.2.1
@@ -39,7 +39,7 @@
 }
 
 bool CEDevice::hasWideResolution() {
-	return (GetSystemMetrics(SM_CXSCREEN) >= 640 && GetSystemMetrics(SM_CYSCREEN) >= 480);
+	return (GetSystemMetrics(SM_CXSCREEN) >= 640 || GetSystemMetrics(SM_CYSCREEN) >= 640);
 }
 
 bool CEDevice::hasSmartphoneResolution() {

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- wince-sdl.cpp	24 Feb 2004 22:04:37 -0000	1.4.2.2
+++ wince-sdl.cpp	24 Feb 2004 22:15:54 -0000	1.4.2.3
@@ -437,10 +437,10 @@
 	}
 
 	// Check if the scaler can be accepted, if not get back to normal scaler
-	if (_scaleFactor && (_scaleFactor * _screenWidth > GetSystemMetrics(SM_CXSCREEN) &&
+	if (_scaleFactor && ((_scaleFactor * _screenWidth > GetSystemMetrics(SM_CXSCREEN) &&
 						  _scaleFactor * _screenWidth > GetSystemMetrics(SM_CYSCREEN))
-					 || (_scaleFactor * _screenHeight > GetSystemMetrics(SM_CXSCREEN) &&
-						_scaleFactor * _screenHeight > GetSystemMetrics(SM_CYSCREEN))) {
+					  || (_scaleFactor * _screenHeight > GetSystemMetrics(SM_CXSCREEN) &&
+						  _scaleFactor * _screenHeight > GetSystemMetrics(SM_CYSCREEN)))) {
 				_scaleFactor = 1;
 				_scaler_proc = Normal1x;
 	}