aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bacca2004-02-24 22:17:08 +0000
committerNicolas Bacca2004-02-24 22:17:08 +0000
commit70f910cbe19e9c7320a56fa48669f7a5e9df00e6 (patch)
tree32ea0a3bd353a2b2501b61f6a6c311b40c70cefe
parent3ed154f80f46feff71c2f485e2ba29c0040256e7 (diff)
downloadscummvm-rg350-70f910cbe19e9c7320a56fa48669f7a5e9df00e6.tar.gz
scummvm-rg350-70f910cbe19e9c7320a56fa48669f7a5e9df00e6.tar.bz2
scummvm-rg350-70f910cbe19e9c7320a56fa48669f7a5e9df00e6.zip
Random 640x480 tweaks
svn-id: r13035
-rw-r--r--backends/wince/CEDevice.cpp2
-rw-r--r--backends/wince/wince-sdl.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/wince/CEDevice.cpp b/backends/wince/CEDevice.cpp
index d0236cbf72..b9fd8e789d 100644
--- a/backends/wince/CEDevice.cpp
+++ b/backends/wince/CEDevice.cpp
@@ -39,7 +39,7 @@ bool CEDevice::hasDesktopResolution() {
}
bool CEDevice::hasWideResolution() {
- return (GetSystemMetrics(SM_CXSCREEN) >= 640 && GetSystemMetrics(SM_CYSCREEN) >= 480);
+ return (GetSystemMetrics(SM_CXSCREEN) >= 640 || GetSystemMetrics(SM_CYSCREEN) >= 640);
}
bool CEDevice::hasSmartphoneResolution() {
diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp
index 58227d78b1..df2dbe574c 100644
--- a/backends/wince/wince-sdl.cpp
+++ b/backends/wince/wince-sdl.cpp
@@ -437,10 +437,10 @@ void OSystem_WINCE3::load_gfx_mode() {
}
// 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_CYSCREEN)))) {
_scaleFactor = 1;
_scaler_proc = Normal1x;
}