diff options
author | Max Horn | 2004-01-08 21:21:40 +0000 |
---|---|---|
committer | Max Horn | 2004-01-08 21:21:40 +0000 |
commit | 04b002bbaaef75f45c2fb962dbbce23db53116e7 (patch) | |
tree | d21d5b51f4e0bebb87f62e6e5599b5321e47cfad /scumm/scumm.h | |
parent | ebecf1dbaa0284f22a053e5b2e9510d6e6db4fdf (diff) | |
download | scummvm-rg350-04b002bbaaef75f45c2fb962dbbce23db53116e7.tar.gz scummvm-rg350-04b002bbaaef75f45c2fb962dbbce23db53116e7.tar.bz2 scummvm-rg350-04b002bbaaef75f45c2fb962dbbce23db53116e7.zip |
move the charset mask to the charset renderer class; some other related changes
svn-id: r12263
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 29072a4bef..145e268506 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -246,6 +246,8 @@ class ScummEngine : public Engine { friend class ScummDebugger; friend class SmushPlayer; friend class Insane; + friend class CharsetRenderer; + void errorString(const char *buf_input, char *buf_output); public: /* Put often used variables at the top. @@ -371,6 +373,13 @@ public: } return _scummVars[var]; } + int32 scummVar(byte var, const char *varName, const char *file, int line) const + { + if (var == 0xFF) { + warning("Illegal access to variable %s in file %s, line %d", varName, file, line); + } + return _scummVars[var]; + } protected: int16 _varwatch; @@ -765,6 +774,8 @@ protected: uint32 _CLUT_offs; uint32 _IM00_offs, _PALS_offs; + StripTable *_roomStrips; + //ender: fullscreen bool _fullRedraw, _BgNeedsRedraw, _verbRedraw; bool _screenEffectFlag, _completeScreenRedraw; @@ -787,8 +798,10 @@ protected: bool isDrawn; } _flashlight; - StripTable *_roomStrips; - +public: + bool isLightOn() const; + +protected: void initScreens(int b, int h); void initVirtScreen(VirtScreenNumber slot, int number, int top, int width, int height, bool twobufs, bool scrollable); void initBGBuffers(int height); @@ -1005,7 +1018,9 @@ protected: bool areBoxesNeighbours(int i, int j); /* String class */ +public: CharsetRenderer *_charset; +protected: byte _charsetColor; public: byte _charsetColorMap[16]; @@ -1018,10 +1033,7 @@ protected: protected: void initCharset(int charset); - void restoreCharsetBg(); -public: - bool hasCharsetMask(int left, int top, int right, int bottom); -protected: + void CHARSET_1(); void drawString(int a); const byte *addMessageToStack(const byte *msg); |