[Scummvm-cvs-logs] SF.net SVN: scummvm:[39043] scummvm/trunk/backends/platform/wince/wince-sdl .cpp
knakos at users.sourceforge.net
knakos at users.sourceforge.net
Sun Mar 1 18:45:57 CET 2009
Revision: 39043
http://scummvm.svn.sourceforge.net/scummvm/?rev=39043&view=rev
Author: knakos
Date: 2009-03-01 17:45:57 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
modified patch in bug #2644574: fix build
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 2009-03-01 16:38:30 UTC (rev 39042)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-03-01 17:45:57 UTC (rev 39043)
@@ -1757,8 +1757,7 @@
}
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::internDrawMouse() {
- if (_mouseDrawn || !_mouseVisible || !_mouseData)
+ if (!_mouseNeedsRedraw || !_mouseVisible || !_mouseData)
return;
int x = _mouseCurState.x - _mouseHotspotX;
@@ -2016,15 +2015,15 @@
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::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();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list