aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_lok.h
diff options
context:
space:
mode:
authorJohannes Schickel2011-04-07 00:08:47 +0200
committerJohannes Schickel2011-04-07 00:11:36 +0200
commit6d0bb19a51ac2996e8563f176ae2f2af1925369e (patch)
tree14d8058b0234a41c5c0ddf02f13835e3518af534 /engines/kyra/kyra_lok.h
parentf4dde644064cd717cd82b3cf873d866a58d15a23 (diff)
downloadscummvm-rg350-6d0bb19a51ac2996e8563f176ae2f2af1925369e.tar.gz
scummvm-rg350-6d0bb19a51ac2996e8563f176ae2f2af1925369e.tar.bz2
scummvm-rg350-6d0bb19a51ac2996e8563f176ae2f2af1925369e.zip
KYRA: Cleanup static variable usage in LoK.
Diffstat (limited to 'engines/kyra/kyra_lok.h')
-rw-r--r--engines/kyra/kyra_lok.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index dfbf5bddd8..d1ff24ad85 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -447,6 +447,9 @@ protected:
uint16 _currentChatPartnerBackupFrame;
uint16 _currentCharAnimFrame;
+ int _characterFacingZeroCount[8];
+ int _characterFacingFourCount[8];
+
int8 *_sceneAnimTable[50];
uint8 _itemHtDat[145];
@@ -471,6 +474,7 @@ protected:
int8 _charSayUnk2;
int8 _charSayUnk3;
int8 _currHeadShape;
+ int _currentHeadFrameTableIndex;
int8 _disabledTalkAnimObject;
int8 _enabledTalkAnimObject;
uint8 _currSentenceColor[3];
@@ -498,6 +502,15 @@ protected:
Button *_buttonList;
GUI_LoK *_gui;
+ uint16 _malcolmFrame;
+ uint32 _malcolmTimer1;
+ uint32 _malcolmTimer2;
+
+ uint32 _beadStateTimer1;
+ uint32 _beadStateTimer2;
+ BeadState _beadState1;
+ BeadState _beadState2;
+
struct KyragemState {
uint16 nextOperation;
uint16 rOffset;