diff options
| author | Alejandro Marzini | 2010-06-08 03:31:27 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-08 03:31:27 +0000 |
| commit | 7ea78b10364d34ae607a9a1da00e4d42ad691aa1 (patch) | |
| tree | c16c3d224b2ad1179dbf3e7c54b5c0212b0581a4 /engines/sci/graphics/picture.h | |
| parent | 7e9d54a69a3444f5335b8cf6ecabdeffe2830644 (diff) | |
| parent | ea2e2053f25c216342c74bb7a74dabc682766720 (diff) | |
| download | scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.tar.gz scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.tar.bz2 scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.zip | |
Merged from trunk.
svn-id: r49499
Diffstat (limited to 'engines/sci/graphics/picture.h')
| -rw-r--r-- | engines/sci/graphics/picture.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/sci/graphics/picture.h b/engines/sci/graphics/picture.h index 3374c33b52..5a86539b37 100644 --- a/engines/sci/graphics/picture.h +++ b/engines/sci/graphics/picture.h @@ -32,6 +32,12 @@ namespace Sci { #define SCI_PATTERN_CODE_USE_TEXTURE 0x20 #define SCI_PATTERN_CODE_PENSIZE 0x07 +enum { + SCI_PICTURE_TYPE_REGULAR = 0, + SCI_PICTURE_TYPE_SCI11 = 1, + SCI_PICTURE_TYPE_SCI32 = 2 +}; + class GfxPorts; class GfxScreen; class GfxPalette; @@ -57,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, bool hasSci32Header); + 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); @@ -80,6 +86,7 @@ private: int16 _resourceId; Resource *_resource; + int _resourceType; int16 _animationNr; bool _mirroredFlag; |