diff options
| author | Martin Kiewitz | 2010-05-25 18:45:25 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-25 18:45:25 +0000 |
| commit | aa8c6377a5cb8c51717f6bcf1ffc950c6c837021 (patch) | |
| tree | 80d7884a604feb59f04a6ea3ffa7d0af00dbc2ed /engines/sci/graphics/picture.h | |
| parent | 5f3952e5787079d8acd3476d3b7f0d67116b5d94 (diff) | |
| download | scummvm-rg350-aa8c6377a5cb8c51717f6bcf1ffc950c6c837021.tar.gz scummvm-rg350-aa8c6377a5cb8c51717f6bcf1ffc950c6c837021.tar.bz2 scummvm-rg350-aa8c6377a5cb8c51717f6bcf1ffc950c6c837021.zip | |
SCI: error out on pattern opcodes inside vector data when drawing pictures in sci1.1+, also adding workaround for garbage data inside picture 381 in sq4
svn-id: r49216
Diffstat (limited to 'engines/sci/graphics/picture.h')
| -rw-r--r-- | engines/sci/graphics/picture.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/sci/graphics/picture.h b/engines/sci/graphics/picture.h index ba6052b059..5a86539b37 100644 --- a/engines/sci/graphics/picture.h +++ b/engines/sci/graphics/picture.h @@ -33,9 +33,9 @@ namespace Sci { #define SCI_PATTERN_CODE_PENSIZE 0x07 enum { - SCI_PICTURE_CELTYPE_REGULAR = 0, - SCI_PICTURE_CELTYPE_SCI11 = 1, - SCI_PICTURE_CELTYPE_SCI32 = 2 + SCI_PICTURE_TYPE_REGULAR = 0, + SCI_PICTURE_TYPE_SCI11 = 1, + SCI_PICTURE_TYPE_SCI32 = 2 }; class GfxPorts; @@ -63,7 +63,7 @@ private: void initData(GuiResourceId resourceId); void reset(); void drawSci11Vga(); - void drawCelData(byte *inbuffer, int size, int headerPos, int rlePos, int literalPos, int16 callerX, int16 callerY, int celType); + void drawCelData(byte *inbuffer, int size, int headerPos, int rlePos, int literalPos, int16 callerX, int16 callerY); void drawVectorData(byte *data, int size); bool vectorIsNonOpcode(byte pixel); void vectorGetAbsCoords(byte *data, int &curPos, int16 &x, int16 &y); @@ -86,6 +86,7 @@ private: int16 _resourceId; Resource *_resource; + int _resourceType; int16 _animationNr; bool _mirroredFlag; |