diff options
| author | Travis Howell | 2009-06-03 06:52:39 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-06-03 06:52:39 +0000 |
| commit | 59cb31d0134ee936b76bd54722be2671a813f46e (patch) | |
| tree | 94c816ec5b77d88116a14ff164672df9c75a2486 /engines/scumm/he/wiz_he.h | |
| parent | ad09b501683346b602af708a420c2c1c5c72871b (diff) | |
| download | scummvm-rg350-59cb31d0134ee936b76bd54722be2671a813f46e.tar.gz scummvm-rg350-59cb31d0134ee936b76bd54722be2671a813f46e.tar.bz2 scummvm-rg350-59cb31d0134ee936b76bd54722be2671a813f46e.zip | |
Cleanup.
svn-id: r41135
Diffstat (limited to 'engines/scumm/he/wiz_he.h')
| -rw-r--r-- | engines/scumm/he/wiz_he.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h index 86df15c3e6..e6ea0fe57e 100644 --- a/engines/scumm/he/wiz_he.h +++ b/engines/scumm/he/wiz_he.h @@ -73,13 +73,13 @@ struct WizParameters { int resDefImgW; int resDefImgH; int sourceImage; - int lineUnk1; - int lineUnk2; + int params1; + int params2; uint8 remapColor[256]; uint8 remapIndex[256]; int remapNum; int dstResNum; - byte fillColor; + uint16 fillColor; byte string1[4096]; byte string2[4096]; int field_2399; @@ -133,7 +133,7 @@ enum WizProcessFlags { kWPFFillColor = 0x20000, kWPFClipBox2 = 0x40000, kWPFMaskImg = 0x80000, - kWPFThickLine = 0x100000 + kWPFParams = 0x100000 }; enum { @@ -209,9 +209,9 @@ public: template<int type> static void decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr = NULL, const uint8 *xmapPtr = NULL); template<int type> void decompress16BitWizImage(uint8 *dst, int dstPitch, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr = NULL, const uint8 *xmapPtr = NULL); template<int type> static void decompressRawWizImage(uint8 *dst, int dstPitch, const uint8 *src, int srcPitch, int w, int h, int transColor, const uint8 *palPtr = NULL); - int isWizPixelNonTransparent(const uint8 *data, int x, int y, int w, int h, uint bitdepth); - uint8 getWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint bitDepth, uint8 color); - uint8 getRawWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint bitDepth, uint8 color); + int isWizPixelNonTransparent(const uint8 *data, int x, int y, int w, int h, uint8 bitdepth); + uint16 getWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint8 bitDepth, uint16 color); + uint16 getRawWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint8 bitDepth, uint16 color); void computeWizHistogram(uint32 *histogram, const uint8 *data, const Common::Rect& rCapt); void computeRawWizHistogram(uint32 *histogram, const uint8 *data, int srcPitch, const Common::Rect& rCapt); |