[Scummvm-git-logs] scummvm master -> 1441468855021263c9d6a10475539d3ce69e6755

bluegr bluegr at gmail.com
Sun Jul 21 22:24:57 CEST 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1441468855 SCI: Fix kDrawPic palette validation


Commit: 1441468855021263c9d6a10475539d3ce69e6755
    https://github.com/scummvm/scummvm/commit/1441468855021263c9d6a10475539d3ce69e6755
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-07-21T23:24:53+03:00

Commit Message:
SCI: Fix kDrawPic palette validation

Fixes CAMELOT bug #11024

Changed paths:
    engines/sci/graphics/picture.cpp


diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index 3ae1fd0..96c6e98 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -424,7 +424,6 @@ void GfxPicture::drawVectorData(const SciSpan<const byte> &data) {
 	byte pic_priority = 255, pic_control = 255;
 	int16 x = 0, y = 0, oldx, oldy;
 	byte EGApalettes[PIC_EGAPALETTE_TOTALSIZE] = {0};
-	byte *EGApalette = &EGApalettes[_EGApaletteNo * PIC_EGAPALETTE_SIZE];
 	byte EGApriority[PIC_EGAPRIORITY_SIZE] = {0};
 	bool isEGA = false;
 	uint curPos = 0;
@@ -438,8 +437,10 @@ void GfxPicture::drawVectorData(const SciSpan<const byte> &data) {
 
 	memset(&palette, 0, sizeof(palette));
 
-	if (_EGApaletteNo >= PIC_EGAPALETTE_COUNT)
+	if (_EGApaletteNo >= PIC_EGAPALETTE_COUNT) {
 		_EGApaletteNo = 0;
+	}
+	byte *EGApalette = &EGApalettes[_EGApaletteNo * PIC_EGAPALETTE_SIZE];
 
 	if (_resMan->getViewType() == kViewEga) {
 		isEGA = true;





More information about the Scummvm-git-logs mailing list