[Scummvm-cvs-logs] SF.net SVN: scummvm:[39059] scummvm/trunk/backends/platform/wince

[knakos at users.sourceforge.net]

Revision: 39059
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39059&view=rev
Author:   knakos
Date:     2009-03-01 22:13:48 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
better detection of aspect-scalable resolutions

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp
    scummvm/trunk/backends/platform/wince/wince-sdl.h

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-03-01 22:09:46 UTC (rev 39058)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-03-01 22:13:48 UTC (rev 39059)
@@ -478,7 +478,7 @@
 
 
 OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(),
-	_orientationLandscape(0), _newOrientation(0), _panelInitialized(false),
+	_orientationLandscape(0), _newOrientation(0), _panelInitialized(false), _canBeAspectScaled(false),
 	_panelVisible(true), _panelStateForced(false), _forceHideMouse(false), _unfilteredkeys(false),
 	_freeLook(false), _forcePanelInvisible(false), _toolbarHighDrawn(false), _zoomUp(false), _zoomDown(false),
 	_scalersChanged(false), _lastKeyPressed(0), _tapTime(0), _closeClick(false), _noDoubleTapRMB(false),
@@ -1097,8 +1097,11 @@
 		ConfMan.flushToDisk();
 	}
 
-	if (w == 320 && h == 200 && !_hasSmartphoneResolution)
+	_canBeAspectScaled = false;
+	if (w == 320 && h == 200 && !_hasSmartphoneResolution) {
+		_canBeAspectScaled = true;
 		h = 240; // use the extra 40 pixels height for the toolbar
+	}
 
 	if (h == 400)	// touche engine fixup
 		h += 80;
@@ -1166,8 +1169,7 @@
 				_modeFlags = 0;
 			}
 		} else if ( _orientationLandscape && (_videoMode.screenWidth == 320 || !_videoMode.screenWidth)) {
-			Common::String gameid(ConfMan.get("gameid"));	// consider removing this check and start honoring the _videoMode.aspectRatio flag
-			if (!_panelVisible && !_hasSmartphoneResolution  && !_overlayVisible && !(strncmp(gameid.c_str(), "zak", 3) == 0)) {
+			if (!_panelVisible && !_hasSmartphoneResolution  && !_overlayVisible && _canBeAspectScaled) {
 				_scaleFactorXm = 1;
 				_scaleFactorXd = 1;
 				_scaleFactorYm = 6;

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h	2009-03-01 22:09:46 UTC (rev 39058)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h	2009-03-01 22:13:48 UTC (rev 39059)
@@ -209,6 +209,8 @@
 
 	bool _usesEmulatedMouse;	// emulated mousemove ever been used in this session
 
+	bool _canBeAspectScaled;	// game screen size allows for aspect scaling
+
 	int _scaleFactorXm;		// scaler X *
 	int _scaleFactorXd;		// scaler X /
 	int _scaleFactorYm;		// scaler Y *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.