diff options
author | Max Horn | 2004-01-25 12:20:59 +0000 |
---|---|---|
committer | Max Horn | 2004-01-25 12:20:59 +0000 |
commit | 32a58b360386c96a7aebecb585d92683145d81b1 (patch) | |
tree | 7d61295d24842a1614ed33ea74c41f1de36258c4 /scumm/scumm.h | |
parent | 5fa9dfa87e990157afa3869a67b1706ddce904bf (diff) | |
download | scummvm-rg350-32a58b360386c96a7aebecb585d92683145d81b1.tar.gz scummvm-rg350-32a58b360386c96a7aebecb585d92683145d81b1.tar.bz2 scummvm-rg350-32a58b360386c96a7aebecb585d92683145d81b1.zip |
get rid of ScummEngine::_insaneState (I think we should eventually stop calling processKbd() from inside smush and replace it with special code there)
svn-id: r12589
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index c2fba44076..b9a746963d 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -340,7 +340,7 @@ public: // Event handling void parseEvents(); void waitForTimer(int msec_delay); - void processKbd(); + void processKbd(bool smushMode); void clearClickedStatus(); // Misc utility functions @@ -355,7 +355,6 @@ public: /* _insane vars */ int _smushFrameRate; - bool _insaneState; bool _videoFinished; bool _smushPaused; @@ -954,10 +953,6 @@ protected: int _drawObjectQueNr; byte _drawObjectQue[200]; - byte _palManipStart, _palManipEnd; - uint16 _palManipCounter; - byte *_palManipPalette; - byte *_palManipIntermediatePal; /* For each of the 410 screen strips, gfxUsageBits contains a * bitmask. The lower 80 bits each correspond to one actor and @@ -990,6 +985,11 @@ protected: int _palDirtyMin, _palDirtyMax; + byte _palManipStart, _palManipEnd; + uint16 _palManipCounter; + byte *_palManipPalette; + byte *_palManipIntermediatePal; + byte _haveMsg; bool _useTalkAnims; uint16 _defaultTalkDelay; @@ -1044,18 +1044,15 @@ protected: /* String class */ public: CharsetRenderer *_charset; -protected: - byte _charsetColor; -public: byte _charsetColorMap[16]; protected: + byte _charsetColor; byte _charsetData[15][16]; int _charsetBufPos; byte _charsetBuffer[512]; protected: - void initCharset(int charset); void CHARSET_1(); |