aboutsummaryrefslogtreecommitdiff
path: root/scumm/gfx.h
diff options
context:
space:
mode:
authorMax Horn2005-05-11 13:02:40 +0000
committerMax Horn2005-05-11 13:02:40 +0000
commit90b91f12b2db9f86afa40fafc61cc6e112630936 (patch)
treed6d6e91950a069946d8940a8407f2ce221536cc1 /scumm/gfx.h
parent58562a0b7097e0c644406b69966b10441c16ee55 (diff)
downloadscummvm-rg350-90b91f12b2db9f86afa40fafc61cc6e112630936.tar.gz
scummvm-rg350-90b91f12b2db9f86afa40fafc61cc6e112630936.tar.bz2
scummvm-rg350-90b91f12b2db9f86afa40fafc61cc6e112630936.zip
Made Gdi::_transparentColor protected
svn-id: r18049
Diffstat (limited to 'scumm/gfx.h')
-rw-r--r--scumm/gfx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/gfx.h b/scumm/gfx.h
index 627791f02f..0f498b53c9 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -196,7 +196,6 @@ class Gdi {
ScummEngine *_vm;
public:
- byte _transparentColor;
int _numZBuffer;
int _imgBufOffs[8];
int32 _numStrips;
@@ -206,6 +205,7 @@ public:
protected:
byte *_roomPalette;
+ byte _transparentColor;
byte _decomp_shr, _decomp_mask;
uint32 _vertStripNextInc;
@@ -270,7 +270,7 @@ protected:
public:
void init();
- void roomChanged(byte *roomptr, uint32 IM00_offs);
+ void roomChanged(byte *roomptr, uint32 IM00_offs, byte transparentColor);
void drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height,
int stripnr, int numstrip, byte flag);