[Scummvm-cvs-logs] SF.net SVN: scummvm: [32738] scummvm/trunk/engines/gob/videoplayer.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Fri Jun 20 00:54:17 CEST 2008
Revision: 32738
http://scummvm.svn.sourceforge.net/scummvm/?rev=32738&view=rev
Author: drmccoy
Date: 2008-06-19 15:54:17 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
Fixed a palette issue in Lost in Time
Modified Paths:
--------------
scummvm/trunk/engines/gob/videoplayer.cpp
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2008-06-19 16:27:49 UTC (rev 32737)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2008-06-19 22:54:17 UTC (rev 32738)
@@ -588,12 +588,14 @@
}
void VideoPlayer::copyPalette(CoktelVideo &video, int16 palStart, int16 palEnd) {
- if ((palStart != -1) && (palEnd != -1))
- memcpy(((char *) (_vm->_global->_pPaletteDesc->vgaPal)) + palStart * 3,
- video.getPalette() + palStart * 3,
- (palEnd - palStart + 1) * 3);
- else
- memcpy((char *) _vm->_global->_pPaletteDesc->vgaPal, video.getPalette(), 768);
+ if (palStart < 0)
+ palStart = 0;
+ if (palEnd < 0)
+ palEnd = 255;
+
+ memcpy(((char *) (_vm->_global->_pPaletteDesc->vgaPal)) + palStart * 3,
+ video.getPalette() + palStart * 3,
+ (palEnd - palStart + 1) * 3);
}
void VideoPlayer::writeVideoInfo(const char *videoFile, int16 varX, int16 varY,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list