diff options
author | Johannes Schickel | 2008-05-02 15:39:51 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-05-02 15:39:51 +0000 |
commit | 5e4fceec2eb837257386f790d920eadf483da3cf (patch) | |
tree | 38f440c89b59dca258225d64c78b86e11c4954a9 /engines/kyra/kyra_mr.h | |
parent | c6830b4138be54e056a7cf18b6b900c3e46ab4ff (diff) | |
download | scummvm-rg350-5e4fceec2eb837257386f790d920eadf483da3cf.tar.gz scummvm-rg350-5e4fceec2eb837257386f790d920eadf483da3cf.tar.bz2 scummvm-rg350-5e4fceec2eb837257386f790d920eadf483da3cf.zip |
Moved some character code from kyra2/kyra3 to KyraEngine_v2.
svn-id: r31822
Diffstat (limited to 'engines/kyra/kyra_mr.h')
-rw-r--r-- | engines/kyra/kyra_mr.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h index 20f8349008..542e4de78e 100644 --- a/engines/kyra/kyra_mr.h +++ b/engines/kyra/kyra_mr.h @@ -370,39 +370,11 @@ private: bool _unkSceneScreenFlag1; // character - struct Character { - uint16 sceneId; - uint16 dlgIndex; - uint8 height; - uint8 facing; - uint16 animFrame; - //uint8 unk8, unk9; - byte walkspeed; - uint16 inventory[10]; - int16 x1, y1; - int16 x2, y2; - int16 x3, y3; - }; - - Character _mainCharacter; - int _mainCharX, _mainCharY; - int _charScale; - - void moveCharacter(int facing, int x, int y); - - void updateCharPosWithUpdate(); - int updateCharPos(int *table, int force); - - uint32 _updateCharPosNextUpdate; - static const int8 _updateCharPosXTable[]; - static const int8 _updateCharPosYTable[]; - + int getCharacterWalkspeed() const; void updateCharAnimFrame(int character, int *table); int8 _characterAnimTable[2]; static const uint8 _characterFrameTable[]; - bool _overwriteSceneFacing; - void updateCharPal(int unk1); int _lastCharPalLayer; bool _charPalUpdate; |