[Scummvm-cvs-logs] SF.net SVN: scummvm:[42710] scummvm/trunk/graphics/video/coktelvideo/ coktelvideo.cpp

[drmccoy at users.sourceforge.net]

Revision: 42710
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42710&view=rev
Author:   drmccoy
Date:     2009-07-24 21:34:17 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
Adding stubs for newer VMDs found in Addy 5

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2009-07-24 21:33:55 UTC (rev 42709)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2009-07-24 21:34:17 UTC (rev 42710)
@@ -1118,8 +1118,17 @@
 	handle       = _stream->readUint16LE();
 	_version     = _stream->readUint16LE();
 
+	bool readPalette;
+
 	// Version checking
-	if (headerLength != 814) {
+	if (headerLength == 50) {
+		// Newer version, used in Addy 5 upwards
+		warning("Vmd::load(): TODO: Addy 5 videos");
+		readPalette = false;
+	} else if (headerLength == 814) {
+		// Old version
+		readPalette = true;
+	} else {
 		warning("Vmd::load(): Version incorrect (%d, %d, %d)", headerLength, handle, _version);
 		unload();
 		return false;
@@ -1162,7 +1171,8 @@
 
 	_videoCodec = _stream->readUint32BE();
 
-	_stream->read((byte *) _palette, 768);
+	if (readPalette)
+		_stream->read((byte *) _palette, 768);
 
 	_frameDataSize = _stream->readUint32LE();
 	_vidBufferSize = _stream->readUint32LE();
@@ -1398,6 +1408,10 @@
 				}
 
 				_stream->skip(part.size);
+			} else if (part.flags == 4) {
+				warning("Vmd::processFrame(): TODO: Addy 5 sound type 4 (%d)", part.size);
+				disableSound();
+				_stream->skip(part.size);
 			} else {
 				warning("Vmd::processFrame(): Unknown sound type %d", part.flags);
 				_stream->skip(part.size);


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