[Scummvm-cvs-logs] SF.net SVN: scummvm:[49914] scummvm/trunk/engines/sci/engine/kernel32.cpp

[mthreepwood at users.sourceforge.net]

Revision: 49914
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49914&view=rev
Author:   mthreepwood
Date:     2010-06-17 00:20:40 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Only hide/show cursor when playing a VMD if it was visible in the first place.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel32.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-06-17 00:07:03 UTC (rev 49913)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-06-17 00:20:40 UTC (rev 49914)
@@ -898,17 +898,17 @@
 reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv) {
 	uint16 operation = argv[0].toUint16();
 	Graphics::VideoDecoder *videoDecoder = 0;
-	Common::String fileName;
+	bool reshowCursor = g_sci->_gfxCursor->isVisible();
+	Common::String fileName, warningMsg;
 
-	Common::String warningMsg;
-
 	switch (operation) {
 	case 0:	// play
 		fileName = s->_segMan->derefString(argv[1]);
 		// TODO: argv[2] (usually 0)
 		videoDecoder = new VMDDecoder(g_system->getMixer());
 
-		g_sci->_gfxCursor->kernelHide();
+		if (reshowCursor)
+			g_sci->_gfxCursor->kernelHide();
 
 		if (videoDecoder && videoDecoder->loadFile(fileName)) {
 			uint16 x = (g_system->getWidth() - videoDecoder->getWidth()) / 2;
@@ -944,8 +944,8 @@
 		} else
 			warning("Could not play video %s\n", fileName.c_str());
 
-		g_sci->_gfxCursor->kernelShow();
-
+		if (reshowCursor)
+			g_sci->_gfxCursor->kernelShow();
 		break;
 	default:
 		warningMsg = "PlayVMD - unsupported subop. Params: " +


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