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

[thebluegr at users.sourceforge.net]

Revision: 40475
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40475&view=rev
Author:   thebluegr
Date:     2009-05-12 08:27:06 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Synced WinCE SDL backend with the changes in commit #40226. Hopefully, this will fix bug #2790461 - "WINCE: Compilation broken"

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

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-05-12 08:22:20 UTC (rev 40474)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2009-05-12 08:27:06 UTC (rev 40475)
@@ -1153,7 +1153,7 @@
 	if (_videoMode.mode != GFX_NORMAL)
 		return false;
 
-	_videoMode.aspectRatio = false;
+	_videoMode.aspectRatioCorrection = false;
 
 	if (CEDevice::hasPocketPCResolution()) {
 		if (	(!_orientationLandscape && (_videoMode.screenWidth == 320 || !_videoMode.screenWidth))
@@ -1181,7 +1181,7 @@
 				_scaleFactorYd = 5;
 				_scalerProc = PocketPCLandscapeAspect;
 				_modeFlags = 0;
-				_videoMode.aspectRatio = true;
+				_videoMode.aspectRatioCorrection = true;
 			} else {
 				_scaleFactorXm = 1;
 				_scaleFactorXd = 1;
@@ -1367,7 +1367,7 @@
 
 	// Create the surface that contains the scaled graphics in 16 bit mode
 	// Always use full screen mode to have a "clean screen"
-	if (!_videoMode.aspectRatio) {
+	if (!_videoMode.aspectRatioCorrection) {
 		displayWidth = _videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd;
 		displayHeight = _videoMode.screenHeight * _scaleFactorYm / _scaleFactorYd;
 	} else {
@@ -1559,7 +1559,7 @@
 	// If the shake position changed, fill the dirty area with blackness
 	if (_currentShakePos != _newShakePos) {
 		SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd, _newShakePos * _scaleFactorYm / _scaleFactorYd};
-		if (_videoMode.aspectRatio)
+		if (_videoMode.aspectRatioCorrection)
 			blackrect.h = real2Aspect(blackrect.h - 1) + 1;
 		SDL_FillRect(_hwscreen, &blackrect, 0);
 		_currentShakePos = _newShakePos;


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