[Scummvm-cvs-logs] CVS: scummvm/backends/wince CEDevice.cpp,1.2.2.1,1.2.2.2 CEDevice.h,1.1,1.1.2.1

[Nicolas Bacca]

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

Modified Files:
      Tag: branch-0-6-0
	CEDevice.cpp CEDevice.h 
Log Message:
Fix 640x240 detection - remove useless function

Index: CEDevice.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEDevice.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- CEDevice.cpp	24 Feb 2004 22:15:54 -0000	1.2.2.1
+++ CEDevice.cpp	5 Mar 2004 08:50:31 -0000	1.2.2.2
@@ -31,15 +31,13 @@
 #define KEY_TASK 0xc4
 
 bool CEDevice::hasPocketPCResolution() {
-	return (GetSystemMetrics(SM_CXSCREEN) < 320 && GetSystemMetrics(SM_CXSCREEN) >= 240);
-}
-
-bool CEDevice::hasDesktopResolution() {
-	return (GetSystemMetrics(SM_CXSCREEN) >= 320);
+	return ((GetSystemMetrics(SM_CXSCREEN) < 320 && GetSystemMetrics(SM_CXSCREEN) >= 240) ||
+			(GetSystemMetrics(SM_CXSCREEN) >= 320 && GetSystemMetrics(SM_CYSCREEN) < 480));
 }
 
 bool CEDevice::hasWideResolution() {
-	return (GetSystemMetrics(SM_CXSCREEN) >= 640 || GetSystemMetrics(SM_CYSCREEN) >= 640);
+	return ((GetSystemMetrics(SM_CXSCREEN) >= 640 && GetSystemMetrics(SM_CYSCREEN) >= 480)
+		   ||(GetSystemMetrics(SM_CYSCREEN) >= 640 && GetSystemMetrics(SM_CXSCREEN) >= 480));
 }
 
 bool CEDevice::hasSmartphoneResolution() {

Index: CEDevice.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEDevice.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- CEDevice.h	26 Jan 2004 08:20:26 -0000	1.1
+++ CEDevice.h	5 Mar 2004 08:50:31 -0000	1.1.2.1
@@ -32,7 +32,6 @@
 class CEDevice {
 	public:
 		static bool hasPocketPCResolution();
-		static bool hasDesktopResolution();
 		static bool hasWideResolution();
 		static bool hasSmartphoneResolution();
 		static bool enableHardwareKeyMapping();