From 1761e6bc990f49ba5ed048208f179b83329ae720 Mon Sep 17 00:00:00 2001
From: Kostas Nakos
Date: Sun, 1 Mar 2009 17:45:57 +0000
Subject: modified patch in bug #2644574: fix build

svn-id: r39043
---
 backends/platform/wince/wince-sdl.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index e92f7549d7..5c383504e5 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -1757,8 +1757,7 @@ void OSystem_WINCE3::internUpdateScreen() {
 }
 
 Graphics::Surface *OSystem_WINCE3::lockScreen() {
-	// FIXME: Fingolfin asks: Why is undrawMouse() needed here?
-	// Please document this.
+	// Make sure mouse pointer is not painted over the playfield at the time of locking
 	undrawMouse();
 	return OSystem_SDL::lockScreen();
 }
@@ -1931,7 +1930,7 @@ void OSystem_WINCE3::setMousePos(int x, int y) {
 
 
 void OSystem_WINCE3::internDrawMouse() {
-	if (_mouseDrawn || !_mouseVisible || !_mouseData)
+	if (!_mouseNeedsRedraw || !_mouseVisible || !_mouseData)
 		return;
 
 	int x = _mouseCurState.x - _mouseHotspotX;
@@ -2016,15 +2015,15 @@ void OSystem_WINCE3::internDrawMouse() {
 	SDL_UnlockSurface(_overlayVisible ? _overlayscreen : _screen);
 
 	// Finally, set the flag to indicate the mouse has been drawn
-	_mouseDrawn = true;
+	_mouseNeedsRedraw = false;
 }
 
 void OSystem_WINCE3::undrawMouse() {
 	assert (_transactionMode == kTransactionNone);
 
-	if (!_mouseDrawn)
+	if (_mouseNeedsRedraw)
 		return;
-	_mouseDrawn = false;
+	_mouseNeedsRedraw = true;
 
 	int old_mouse_x = _mouseCurState.x - _mouseHotspotX;
 	int old_mouse_y = _mouseCurState.y - _mouseHotspotY;
@@ -2166,9 +2165,6 @@ void OSystem_WINCE3::hideOverlay() {
 }
 
 void OSystem_WINCE3::drawMouse() {
-	// FIXME: Fingolfin asks: why is there a FIXME here? Please either clarify what
-	// needs fixing, or remove it!
-	// FIXME
 	if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset() && !_usesEmulatedMouse) && !_forceHideMouse)
 		internDrawMouse();
 }
-- 
cgit v1.2.3