aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/gfx.h
diff options
context:
space:
mode:
authorTravis Howell2009-10-26 10:15:05 +0000
committerTravis Howell2009-10-26 10:15:05 +0000
commit88c7ca6f8fb20b04a31c85fe921404f1981e1ca4 (patch)
tree68343080560ce1cab9d07e81c031e873eac9635a /engines/scumm/gfx.h
parente35b6a6e8051ce8efa35df48a36312d4f498accd (diff)
downloadscummvm-rg350-88c7ca6f8fb20b04a31c85fe921404f1981e1ca4.tar.gz
scummvm-rg350-88c7ca6f8fb20b04a31c85fe921404f1981e1ca4.tar.bz2
scummvm-rg350-88c7ca6f8fb20b04a31c85fe921404f1981e1ca4.zip
Add patch from Tobias, for object masking support in PCE version of Loom.
svn-id: r45396
Diffstat (limited to 'engines/scumm/gfx.h')
-rw-r--r--engines/scumm/gfx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h
index 3548a93317..bb9acbeef8 100644
--- a/engines/scumm/gfx.h
+++ b/engines/scumm/gfx.h
@@ -307,7 +307,7 @@ protected:
uint16 nametable[4096], nametableObj[512];
byte colortable[4096], colortableObj[512];
uint16 masktable[4096], masktableObj[512];
- int objX;
+ int maskIDSize;
int numTiles;
int numMasks;
byte* tiles;
@@ -316,7 +316,7 @@ protected:
protected:
void decodePCEngineGfx(const byte *room);
- void decodeStrip(const byte *ptr, uint16 *tiles, byte *colors, uint16 *masks, int dataWidth, int numRows, bool isObject);
+ void decodeStrip(const byte *ptr, uint16 *tiles, byte *colors, uint16 *masks, int numRows, bool isObject);
void decodePCEngineTileData(const byte *ptr);
void decodePCEngineMaskData(const byte *ptr);
void decodePCEngineObject(const byte *ptr, int xpos, int ypos, int width, int height);