[Scummvm-cvs-logs] SF.net SVN: scummvm:[48621] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 48621
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48621&view=rev
Author:   lordhoto
Date:     2010-04-11 17:27:33 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Fix KYRA's cursor handling by pushing a dummy cursor via CursorMan.pushCursor too. Also replace CursorMan.popAllCursors by CursorMan.popCursor to prevent the caller's cursor from being destroyed.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2010-04-11 17:26:32 UTC (rev 48620)
+++ scummvm/trunk/engines/kyra/screen.cpp	2010-04-11 17:27:33 UTC (rev 48621)
@@ -70,7 +70,7 @@
 	for (uint i = 0; i < _palettes.size(); ++i)
 		delete _palettes[i];
 
-	CursorMan.popAllCursors();
+	CursorMan.popCursor();
 }
 
 bool Screen::init() {
@@ -158,6 +158,7 @@
 	_animBlockPtr = NULL;
 	_animBlockSize = 0;
 	_mouseLockCount = 1;
+	CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
 	CursorMan.showMouse(false);
 
 	_forceFullUpdate = false;


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