[Scummvm-cvs-logs] SF.net SVN: scummvm:[35249] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 35249
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35249&view=rev
Author:   drmccoy
Date:     2008-12-05 18:47:50 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
Evaluating kFeaturesPalette flag for VMDs. Now you can actually see something in Urban Runner (though it's far from pretty)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/coktelvideo.cpp
    scummvm/trunk/engines/gob/videoplayer.cpp

Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-05 10:18:39 UTC (rev 35248)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-05 18:47:50 UTC (rev 35249)
@@ -66,6 +66,8 @@
 
 	// IMDs always have video
 	_features |= kFeaturesVideo;
+	// IMDs always have palettes
+	_features |= kFeaturesPalette;
 
 	// Palette
 	_stream->read((byte *) _palette, 768);
@@ -880,6 +882,9 @@
 	uint16 handle = _stream->readUint16LE();
 	_version = _stream->readUint16LE();
 
+	if (!(_version & 2))
+		_features |= kFeaturesPalette;
+
 	// 0x4 (4)
 
 	// Version checking

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2008-12-05 10:18:39 UTC (rev 35248)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2008-12-05 18:47:50 UTC (rev 35249)
@@ -633,6 +633,9 @@
 }
 
 void VideoPlayer::copyPalette(CoktelVideo &video, int16 palStart, int16 palEnd) {
+	if (!(video.getFeatures() & CoktelVideo::kFeaturesPalette))
+		return;
+
 	if (palStart < 0)
 		palStart = 0;
 	if (palEnd < 0)


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