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

[drmccoy at users.sourceforge.net]

Revision: 55270
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55270&view=rev
Author:   drmccoy
Date:     2011-01-16 22:28:20 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
GOB: Don't clobber the global palette

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

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-16 22:27:48 UTC (rev 55269)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-16 22:28:20 UTC (rev 55270)
@@ -753,7 +753,7 @@
 }
 
 void VideoPlayer::copyPalette(const Video &video, int16 palStart, int16 palEnd) {
-	if (!video.decoder->hasPalette())
+	if (!video.decoder->hasPalette() || !video.decoder->isPaletted())
 		return;
 
 	if (palStart < 0)


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