diff options
author | Johannes Schickel | 2008-05-02 17:14:59 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-05-02 17:14:59 +0000 |
commit | a829244b8ce5f5444e5c109aba6b8744d6327d7b (patch) | |
tree | f2a59570bece7b9d401f1a3b56fd889ca4786f4b /engines/kyra/kyra_v2.h | |
parent | c84b3719575cc26ad8f68c41191bd6e9f79f5249 (diff) | |
download | scummvm-rg350-a829244b8ce5f5444e5c109aba6b8744d6327d7b.tar.gz scummvm-rg350-a829244b8ce5f5444e5c109aba6b8744d6327d7b.tar.bz2 scummvm-rg350-a829244b8ce5f5444e5c109aba6b8744d6327d7b.zip |
- Renamed ScreenAnimator -> Animator_v1
- Moved addItemToAnimList and deleteItemAnimEntry to KyraEngine_v2.
svn-id: r31831
Diffstat (limited to 'engines/kyra/kyra_v2.h')
-rw-r--r-- | engines/kyra/kyra_v2.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 44647e331e..6a426f3761 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -80,7 +80,7 @@ protected: struct AnimObj { uint16 index; uint16 type; - uint16 enabled; + bool enabled; uint16 needRefresh; uint16 specialRefresh; uint16 animFlags; @@ -99,6 +99,13 @@ protected: AnimObj *nextObject; }; + void allocAnimObjects(int actors, int anims, int items); + AnimObj *_animObjects; + + AnimObj *_animActor; + AnimObj *_animAnims; + AnimObj *_animItems; + bool _drawNoShapeFlag; AnimObj *_animList; @@ -121,12 +128,16 @@ protected: virtual void updateCharacterAnim(int) = 0; virtual void updateSceneAnim(int anim, int newFrame) = 0; - virtual void addItemToAnimList(int item) = 0; - virtual void deleteItemAnimEntry(int item) = 0; + void addItemToAnimList(int item); + void deleteItemAnimEntry(int item); + + virtual void animSetupPaletteEntry(AnimObj *) {} virtual void setCharacterAnimDim(int w, int h) = 0; virtual void resetCharacterAnimDim() = 0; + virtual int getScale(int x, int y) = 0; + // Scene struct SceneDesc { char filename1[10]; @@ -197,6 +208,8 @@ protected: void addShapeToPool(uint8 *shpData, int index); void remShapeFromPool(int idx); + virtual int getItemShape(int item) const = 0; + int _characterShapeFile; virtual void loadCharacterShapes(int shapes) = 0; |