aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he/wiz_he.h
diff options
context:
space:
mode:
authorGregory Montoir2007-01-26 22:03:41 +0000
committerGregory Montoir2007-01-26 22:03:41 +0000
commit51fd5c8c4b5e7232a18a81456986df4c4e9066bb (patch)
tree8f34a7e2c973ae507dc3d885b6639d2ce2f0feee /engines/scumm/he/wiz_he.h
parent7a5284922fc8d2868acb1234d21c77b44e237296 (diff)
downloadscummvm-rg350-51fd5c8c4b5e7232a18a81456986df4c4e9066bb.tar.gz
scummvm-rg350-51fd5c8c4b5e7232a18a81456986df4c4e9066bb.tar.bz2
scummvm-rg350-51fd5c8c4b5e7232a18a81456986df4c4e9066bb.zip
templatified some Wiz decoding functions
svn-id: r25209
Diffstat (limited to 'engines/scumm/he/wiz_he.h')
-rw-r--r--engines/scumm/he/wiz_he.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h
index 88e0db50a9..bbb0fc50bb 100644
--- a/engines/scumm/he/wiz_he.h
+++ b/engines/scumm/he/wiz_he.h
@@ -133,6 +133,12 @@ enum WizProcessFlags {
kWPFMaskImg = 0x80000
};
+enum {
+ kWizXMap = 0,
+ kWizRMap,
+ kWizCopy
+};
+
class ScummEngine_v70he;
class Wiz {
@@ -196,7 +202,8 @@ public:
static void copyWizImageWithMask(uint8 *dst, const uint8 *src, int dstw, int dsth, int srcx, int srcy, int srcw, int srch, const Common::Rect *rect, int maskT, int maskP);
static void copyRawWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth, int srcx, int srcy, int srcw, int srch, const Common::Rect *rect, int flags, const uint8 *palPtr, int transColor);
static void copyRaw16BitWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth, int srcx, int srcy, int srcw, int srch, const Common::Rect *rect, int flags, const uint8 *palPtr, int transColor);
- static void decompressWizImage(uint8 *dst, int dstPitch, const Common::Rect &dstRect, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr = NULL, const uint8 *xmapPtr = NULL);
+ 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> 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);
uint8 getWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint8 color);
uint8 getRawWizPixelColor(const uint8 *data, int x, int y, int w, int h, uint8 color);