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

[knakos at users.sourceforge.net]

Revision: 26685
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26685&view=rev
Author:   knakos
Date:     2007-04-30 14:12:57 -0700 (Mon, 30 Apr 2007)

Log Message:
-----------
correct place for touche screen size adjustment & one more check in the draw loop

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	2007-04-30 21:11:09 UTC (rev 26684)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-04-30 21:12:57 UTC (rev 26685)
@@ -927,6 +927,9 @@
 	if (w == 320 && h == 200 && !_hasSmartphoneResolution)
 		h = 240; // use the extra 40 pixels height for the toolbar
 
+	if (h == 400)	// touche engine fixup
+		h += 80;
+
 	if (!_hasSmartphoneResolution)
 		if (h == 240)
 			_toolbarHandler.setOffset(200);
@@ -1192,8 +1195,7 @@
 		displayWidth = _screenWidth;
 		displayHeight = _screenHeight;
 	}
-	if (_screenHeight == 400)	// touche engine fixup
-		displayHeight += 80 * _scaleFactorYm / _scaleFactorYd;
+
 	switch (_orientationLandscape) {
 		case 1:
 			flags |= SDL_LANDSCVIDEO;
@@ -1462,6 +1464,10 @@
 			// note that all current scalers do not make dst rect exceed left/right, unless chosen badly (FIXME)
 			if (_zoomDown)	routy -= 240;			// adjust for zoom position
 			if (routy + routh < 0)	continue;
+			if (routy < 0) {
+				routh += routy;
+				routy = 0;
+			}
 			if (_orientationLandscape) {
 				if (routy > _platformScreenWidth)	continue;
 				if (routy + routh > _platformScreenWidth) {


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