aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorTravis Howell2004-06-27 10:54:31 +0000
committerTravis Howell2004-06-27 10:54:31 +0000
commit372296e918e7700c54d762d8924b1d692eecdd81 (patch)
treeac93cce379e52633a9e431259abb69ea09db3a9d /scumm/scumm.h
parent4ffcdcdf4f3d16e3583920f5b0c844b67871ffeb (diff)
downloadscummvm-rg350-372296e918e7700c54d762d8924b1d692eecdd81.tar.gz
scummvm-rg350-372296e918e7700c54d762d8924b1d692eecdd81.tar.bz2
scummvm-rg350-372296e918e7700c54d762d8924b1d692eecdd81.zip
Fix actor palette in HE 7.0 games.
Use roompalette[] for all graphics decoders svn-id: r14075
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 19ca848dd5..e6089fb74d 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1008,9 +1008,11 @@ protected:
bool testGfxOtherUsageBits(int strip, int bit);
public:
+ byte he_actor_palette[256];
byte _proc_special_palette[256];
byte _roomPalette[256];
byte *_shadowPalette;
+ int _staticVar1, _staticVar2, _staticVar3, _staticVar4, _staticVar5;
protected:
int _shadowPaletteSize;
@@ -1030,7 +1032,6 @@ protected:
int _saveSound;
bool _native_mt32;
int _midiDriver; // Use the MD_ values from mididrv.h
- int _staticVar1, _staticVar2, _staticVar3, _staticVar4, _staticVar5;
bool _copyProtection;
bool _demoMode;
bool _confirmExit;