aboutsummaryrefslogtreecommitdiff
path: root/engines/draci/animation.h
diff options
context:
space:
mode:
authorDenis Kasak2009-07-05 11:52:17 +0000
committerDenis Kasak2009-07-05 11:52:17 +0000
commit8e341ee968017be7d5bf7690473c80500c6b75d9 (patch)
tree809b77787a29c0e072bc0b5ef37f1ad9ef564e95 /engines/draci/animation.h
parent6c3e9f5151fac4906c2fabc2e26ee39bc7043664 (diff)
downloadscummvm-rg350-8e341ee968017be7d5bf7690473c80500c6b75d9.tar.gz
scummvm-rg350-8e341ee968017be7d5bf7690473c80500c6b75d9.tar.bz2
scummvm-rg350-8e341ee968017be7d5bf7690473c80500c6b75d9.zip
Renaming Animation -> AnimationManager and AnimObj -> Animation in light of the new API change.
svn-id: r42133
Diffstat (limited to 'engines/draci/animation.h')
-rw-r--r--engines/draci/animation.h24
1 files changed, 11 insertions, 13 deletions
diff --git a/engines/draci/animation.h b/engines/draci/animation.h
index d4be8b5ba3..6fbd185b1f 100644
--- a/engines/draci/animation.h
+++ b/engines/draci/animation.h
@@ -34,10 +34,11 @@ enum { kOverlayImage = -1, kUnused = -2 };
class DraciEngine;
-class AnimObj {
+class Animation {
+
public:
- AnimObj(DraciEngine *vm);
- ~AnimObj();
+ Animation(DraciEngine *vm);
+ ~Animation();
uint getZ();
void setZ(uint z);
@@ -60,7 +61,6 @@ public:
bool isLooping();
void setLooping(bool looping);
-
private:
uint nextFrameNum();
@@ -77,16 +77,14 @@ private:
DraciEngine *_vm;
};
-// TODO: Probably needs a namechange to AnimationManager or similar since AnimObj now
-// acts as an animation object
-class Animation {
+class AnimationManager {
public:
- Animation(DraciEngine *vm) : _vm(vm) {};
- ~Animation() { deleteAll(); }
+ AnimationManager(DraciEngine *vm) : _vm(vm) {};
+ ~AnimationManager() { deleteAll(); }
- AnimObj *addAnimation(int id, uint z, bool playing = false);
+ Animation *addAnimation(int id, uint z, bool playing = false);
void addOverlay(Drawable *overlay, uint z);
void play(int id);
@@ -97,14 +95,14 @@ public:
void drawScene(Surface *surf);
- AnimObj *getAnimation(int id);
+ Animation *getAnimation(int id);
private:
- void insertAnimation(AnimObj *animObj);
+ void insertAnimation(Animation *anim);
DraciEngine *_vm;
- Common::List<AnimObj *> _animObjects;
+ Common::List<Animation *> _animations;
};
}