[Scummvm-cvs-logs] SF.net SVN: scummvm: [22509] scummvm/trunk/gui

[sev at users.sourceforge.net]

Revision: 22509
Author:   sev
Date:     2006-05-17 19:03:43 -0700 (Wed, 17 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22509&view=rev

Log Message:
-----------
- Revert additional setUpCursor() call as it broke in-game cursor palette
- Disable scaling for cursors which have target scale defined

Modified Paths:
--------------
    scummvm/trunk/backends/sdl/graphics.cpp
    scummvm/trunk/gui/ThemeNew.cpp
Modified: scummvm/trunk/backends/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/sdl/graphics.cpp	2006-05-18 01:44:13 UTC (rev 22508)
+++ scummvm/trunk/backends/sdl/graphics.cpp	2006-05-18 02:03:43 UTC (rev 22509)
@@ -1367,7 +1367,7 @@
 		hH = hH1 = h * _scaleFactor / _cursorTargetScale;
   	}
 
-	if (_adjustAspectRatio) {
+	if (_adjustAspectRatio && _cursorTargetScale == 1) {
 		hH = real2Aspect(hH - 1) + 1;
 	}
 
@@ -1411,7 +1411,7 @@
 		_mouseCurState.w, _mouseCurState.h);
 
 #ifndef DISABLE_SCALERS
-	if (_adjustAspectRatio)
+	if (_adjustAspectRatio && _cursorTargetScale == 1)
 		cursorStretch200To240((uint8 *)_mouseSurface->pixels, _mouseSurface->pitch, hW, hH1, 0, 0, 0);
 #endif
 

Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-05-18 01:44:13 UTC (rev 22508)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-05-18 02:03:43 UTC (rev 22509)
@@ -336,7 +336,6 @@
 		_initOk = true;
 		clearAll();
 		setupFonts();
-		setUpCursor();
 		resetDrawArea();
 	}
 


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