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

[mthreepwood at users.sourceforge.net]

Revision: 55484
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55484&view=rev
Author:   mthreepwood
Date:     2011-01-23 22:08:14 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
MOHAWK: Fix the Riven demo intro sequence (a regression from r55188)

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

Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp	2011-01-23 21:59:26 UTC (rev 55483)
+++ scummvm/trunk/engines/mohawk/video.cpp	2011-01-23 22:08:14 UTC (rev 55484)
@@ -41,7 +41,7 @@
 	start = Video::VideoTimestamp(0);
 	end = Video::VideoTimestamp(0xFFFFFFFF); // Largest possible, there is an endOfVideo() check anyway
 	filename.clear();
-	id = 0;
+	id = -1;
 }
 
 bool VideoEntry::endOfVideo() {

Modified: scummvm/trunk/engines/mohawk/video.h
===================================================================
--- scummvm/trunk/engines/mohawk/video.h	2011-01-23 21:59:26 UTC (rev 55483)
+++ scummvm/trunk/engines/mohawk/video.h	2011-01-23 22:08:14 UTC (rev 55484)
@@ -57,7 +57,7 @@
 
 	// Identification
 	Common::String filename; // External video files
-	uint16 id;               // Internal Mohawk files
+	int id;                  // Internal Mohawk files
 
 	// Helper functions
 	Video::SeekableVideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually


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