diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-04 02:20:38 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-04 02:20:38 +0000 |
| commit | 4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac (patch) | |
| tree | 0b18ed6970f8fdd6750459e6f9032e444d253580 /src/animatedsprite.h | |
| parent | e160ba567bf3d2ae915e67c12c13e213c1a32a62 (diff) | |
| download | mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.tar.gz mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.tar.bz2 mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.tar.xz mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.zip | |
Merged 0.0 changes from revision 2898 to 2988 to trunk.
Diffstat (limited to 'src/animatedsprite.h')
| -rw-r--r-- | src/animatedsprite.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 4e485f14..2257c0f0 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -29,8 +29,9 @@ #include <map> #include <string> +class Animation; class Graphics; -struct AnimationPhase; +struct Frame; /** * Animates a sprite by adding playback state. @@ -72,13 +73,13 @@ class AnimatedSprite /** * Inform the animation of the passed time so that it can output the - * correct animation phase. + * correct animation frame. */ void update(int time); /** - * Draw the current animation phase at the coordinates given in screen + * Draw the current animation frame at the coordinates given in screen * pixels. */ bool @@ -103,7 +104,7 @@ class AnimatedSprite SpriteDef *mSprite; /**< The sprite definition. */ Action *mAction; /**< The currently active action. */ Animation *mAnimation; /**< The currently active animation. */ - AnimationPhase *mFrame; /**< The currently active frame. */ + Frame *mFrame; /**< The currently active frame. */ std::string mAnimationFile; }; |