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

[bgk at users.sourceforge.net]

Revision: 55657
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55657&view=rev
Author:   bgk
Date:     2011-01-30 13:54:39 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
MOHAWK: Myst, pass the playback direction from the calling script to the movie player.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst_areas.cpp
    scummvm/trunk/engines/mohawk/myst_areas.h
    scummvm/trunk/engines/mohawk/myst_scripts.cpp

Modified: scummvm/trunk/engines/mohawk/myst_areas.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_areas.cpp	2011-01-30 13:44:01 UTC (rev 55656)
+++ scummvm/trunk/engines/mohawk/myst_areas.cpp	2011-01-30 13:54:39 UTC (rev 55657)
@@ -173,7 +173,7 @@
 	_left = rlstStream->readSint16LE() % 10000;
 	_top = rlstStream->readSint16LE() % 10000;
 	_playOnCardChange = rlstStream->readUint16LE();
-	_direction = rlstStream->readUint16LE();
+	_direction = rlstStream->readSint16LE();
 	_playBlocking = rlstStream->readUint16LE();
 	_loop = rlstStream->readUint16LE();
 	_u3 = rlstStream->readUint16LE();

Modified: scummvm/trunk/engines/mohawk/myst_areas.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_areas.h	2011-01-30 13:44:01 UTC (rev 55656)
+++ scummvm/trunk/engines/mohawk/myst_areas.h	2011-01-30 13:54:39 UTC (rev 55657)
@@ -108,6 +108,7 @@
 	VideoHandle playMovie();
 	void handleCardChange();
 	bool isPlaying();
+	void setDirection(int16 direction) { _direction = direction; }
 	void setBlocking(bool blocking) { _playBlocking = blocking; }
 	void pauseMovie(bool pause);
 
@@ -117,7 +118,7 @@
 	int16 _left;
 	int16 _top;
 	uint16 _loop;
-	uint16 _direction; // 1 => forward, -1 => backwards
+	int16 _direction; // 1 => forward, -1 => backwards
 	uint16 _playBlocking;
 	uint16 _playOnCardChange;
 	uint16 _u3;

Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp	2011-01-30 13:44:01 UTC (rev 55656)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp	2011-01-30 13:54:39 UTC (rev 55657)
@@ -384,6 +384,7 @@
 
 	// Trigger resource 6 movie overriding play direction
 	MystResourceType6 *resource = static_cast<MystResourceType6 *>(_invokingResource);
+	resource->setDirection(direction);
 	resource->playMovie();
 
 	// TODO: If movie has sound, resume background music


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