[Scummvm-cvs-logs] SF.net SVN: scummvm:[54597] scummvm/trunk/engines/mohawk

[bgk at users.sourceforge.net]

Revision: 54597
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54597&view=rev
Author:   bgk
Date:     2010-11-29 20:50:40 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK: Add mouse move event for type 10 and 11 resources

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/myst.h
    scummvm/trunk/engines/mohawk/myst_scripts_selenitic.cpp

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:50:25 UTC (rev 54596)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:50:40 UTC (rev 54597)
@@ -294,6 +294,10 @@
 				_mousePos = event.mouse;
 				_needsUpdate = true;
 				checkCurrentResource();
+				if (_curResource >= 0) {
+					debug(2, "Sending mouse move event to resource %d\n", _curResource);
+					_resources[_curResource]->handleMouseMove();
+				}
 				break;
 			case Common::EVENT_LBUTTONUP:
 				if (_curResource >= 0) {
@@ -1432,6 +1436,7 @@
 		}
 	}
 
+	_mouseDown = false;
 	warning("TODO: Card contains Type 10 Resource - Function not yet implemented");
 }
 
@@ -1452,7 +1457,7 @@
 	_vm->_scriptParser->runOpcode(_mouseUpOpcode);
 }
 
-void MystResourceType10::handleAnimation() {
+void MystResourceType10::handleMouseMove() {
 	if (_mouseDown) {
 		_vm->_scriptParser->runOpcode(_mouseDragOpcode);
 	}
@@ -1527,7 +1532,7 @@
 	_vm->_scriptParser->runOpcode(_mouseUpOpcode);
 }
 
-void MystResourceType11::handleAnimation() {
+void MystResourceType11::handleMouseMove() {
 	if (_mouseDown) {
 		_vm->_scriptParser->runOpcode(_mouseDragOpcode);
 	}

Modified: scummvm/trunk/engines/mohawk/myst.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst.h	2010-11-29 20:50:25 UTC (rev 54596)
+++ scummvm/trunk/engines/mohawk/myst.h	2010-11-29 20:50:40 UTC (rev 54597)
@@ -169,6 +169,7 @@
 	// Mouse interface
 	virtual void handleMouseUp();
 	virtual void handleMouseDown() {}
+	virtual void handleMouseMove() {}
 	virtual void handleMouseEnter() {}
 	virtual void handleMouseLeave() {}
 
@@ -253,9 +254,9 @@
 public:
 	MystResourceType10(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
 	virtual ~MystResourceType10();
-	void handleAnimation();
 	void handleMouseDown();
 	void handleMouseUp();
+	void handleMouseMove();
 
 protected:
 	uint16 _kind;
@@ -277,9 +278,9 @@
 public:
 	MystResourceType11(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
 	virtual ~MystResourceType11();
-	void handleAnimation();
 	void handleMouseDown();
 	void handleMouseUp();
+	void handleMouseMove();
 
 protected:
 	uint16 _kind;

Modified: scummvm/trunk/engines/mohawk/myst_scripts_selenitic.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts_selenitic.cpp	2010-11-29 20:50:25 UTC (rev 54596)
+++ scummvm/trunk/engines/mohawk/myst_scripts_selenitic.cpp	2010-11-29 20:50:40 UTC (rev 54597)
@@ -514,7 +514,7 @@
 
 void MystScriptParser_Selenitic::o_112_soundLockMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	//varUnusedCheck(op, var);
-	//unknown(op, var, argc, argv);
+	unknown(op, var, argc, argv);
 }
 
 void MystScriptParser_Selenitic::o_113_soundLockStartMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {


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