From 4dfbfe7ecab6b44e4f1d3aee2a70d8e385323604 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 18 May 2006 02:03:43 +0000
Subject: - Revert additional setUpCursor() call as it broke in-game cursor
 palette - Disable scaling for cursors which have target scale defined

svn-id: r22509
---
 backends/sdl/graphics.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'backends')

diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp
index bf8396ca94..70f6d94c8f 100644
--- a/backends/sdl/graphics.cpp
+++ b/backends/sdl/graphics.cpp
@@ -1367,7 +1367,7 @@ void OSystem_SDL::blitCursor() {
 		hH = hH1 = h * _scaleFactor / _cursorTargetScale;
   	}
 
-	if (_adjustAspectRatio) {
+	if (_adjustAspectRatio && _cursorTargetScale == 1) {
 		hH = real2Aspect(hH - 1) + 1;
 	}
 
@@ -1411,7 +1411,7 @@ void OSystem_SDL::blitCursor() {
 		_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
 
-- 
cgit v1.2.3