[Scummvm-cvs-logs] SF.net SVN: scummvm:[35858] scummvm/trunk/engines/groovie

[jvprat at users.sourceforge.net]

Revision: 35858
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35858&view=rev
Author:   jvprat
Date:     2009-01-14 03:09:19 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
Show the cursor and update it properly when closing the GMM.

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/cursor.cpp
    scummvm/trunk/engines/groovie/cursor.h
    scummvm/trunk/engines/groovie/groovie.cpp
    scummvm/trunk/engines/groovie/script.cpp

Modified: scummvm/trunk/engines/groovie/cursor.cpp
===================================================================
--- scummvm/trunk/engines/groovie/cursor.cpp	2009-01-14 02:44:09 UTC (rev 35857)
+++ scummvm/trunk/engines/groovie/cursor.cpp	2009-01-14 03:09:19 UTC (rev 35858)
@@ -45,6 +45,10 @@
 	CursorMan.popAllCursors();
 }
 
+void GrvCursorMan::show(bool visible) {
+	CursorMan.showMouse(visible);
+}
+
 uint8 GrvCursorMan::getStyle() {
 	return _current;
 }

Modified: scummvm/trunk/engines/groovie/cursor.h
===================================================================
--- scummvm/trunk/engines/groovie/cursor.h	2009-01-14 02:44:09 UTC (rev 35857)
+++ scummvm/trunk/engines/groovie/cursor.h	2009-01-14 03:09:19 UTC (rev 35858)
@@ -49,6 +49,7 @@
 	GrvCursorMan(OSystem *system);
 	virtual ~GrvCursorMan();
 
+	virtual void show(bool visible);
 	virtual void animate();
 	virtual void setStyle(uint8 newStyle);
 	virtual uint8 getStyle();

Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp	2009-01-14 02:44:09 UTC (rev 35857)
+++ scummvm/trunk/engines/groovie/groovie.cpp	2009-01-14 03:09:19 UTC (rev 35858)
@@ -195,9 +195,11 @@
 				_waitingForInput = false;
 				break;
 
+			case Common::EVENT_MAINMENU:
+				// Closing the GMM
 			case Common::EVENT_MOUSEMOVE:
-				// Continue the script execution, the mouse
-				// pointer may fall inside a hotspot now
+				// Continue the script execution, the mouse pointer
+				// may fall inside a different hotspot now
 				_waitingForInput = false;
 				break;
 

Modified: scummvm/trunk/engines/groovie/script.cpp
===================================================================
--- scummvm/trunk/engines/groovie/script.cpp	2009-01-14 02:44:09 UTC (rev 35857)
+++ scummvm/trunk/engines/groovie/script.cpp	2009-01-14 03:09:19 UTC (rev 35858)
@@ -689,7 +689,7 @@
 
 		// Exit the input loop
 		_inputLoopAddress = 0;
-		_vm->_system->showMouse(false);
+		_vm->_grvCursorMan->show(false);
 
 		// Force immediate hiding of the mouse cursor (required when the next
 		// video just contains audio)
@@ -701,7 +701,7 @@
 		if (_newCursorStyle != _vm->_grvCursorMan->getStyle()) {
 			_vm->_grvCursorMan->setStyle(_newCursorStyle);
 		}
-		_vm->_system->showMouse(true);
+		_vm->_grvCursorMan->show(true);
 
 		// Go back to the begining of the loop
 		_currentInstruction = _inputLoopAddress;


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