[Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.55.2.1,1.55.2.2

[Torbjörn Andersson]

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

Modified Files:
      Tag: branch-0-8-0
	graphics.cpp 
Log Message:
Backported fix to (hopefully) keep aspect ratio correction from being
applied to other games than the ones that are exactly 200 pixels tall.


Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/graphics.cpp,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -u -d -r1.55.2.1 -r1.55.2.2
--- graphics.cpp	18 Oct 2005 02:11:17 -0000	1.55.2.1
+++ graphics.cpp	7 Nov 2005 08:41:25 -0000	1.55.2.2
@@ -297,9 +297,6 @@
 	_screenWidth = w;
 	_screenHeight = h;
 
-	if (h != 200)
-		_adjustAspectRatio = false;
-
 	if (overlayScale != -1) {
 		_overlayScale = overlayScale;
 		if (w != 320 && w != 256) // 256 is for MM NES
@@ -339,6 +336,9 @@
 	_forceFull = true;
 	_modeFlags |= DF_UPDATE_EXPAND_1_PIXEL;
 
+	if (_screenHeight != 200)
+		_adjustAspectRatio = false;
+
 	//
 	// Create the surface that contains the 8 bit game data
 	//