aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision/animation_node.h
diff options
context:
space:
mode:
authorMarisa-Chan2014-01-17 16:54:59 +0700
committerMarisa-Chan2014-01-17 16:54:59 +0700
commitff2a20889cfead5075c252dd5cdcdba658a40844 (patch)
tree9c85c5203d99c1217b98466e6a136efee0937cce /engines/zvision/animation_node.h
parent3a1fda6d5760b25acb3bb561b567f6402685bcc6 (diff)
downloadscummvm-rg350-ff2a20889cfead5075c252dd5cdcdba658a40844.tar.gz
scummvm-rg350-ff2a20889cfead5075c252dd5cdcdba658a40844.tar.bz2
scummvm-rg350-ff2a20889cfead5075c252dd5cdcdba658a40844.zip
ZVISION: Move code of animation_node to use meta_animation.
Diffstat (limited to 'engines/zvision/animation_node.h')
-rw-r--r--engines/zvision/animation_node.h22
1 files changed, 4 insertions, 18 deletions
diff --git a/engines/zvision/animation_node.h b/engines/zvision/animation_node.h
index 843e59236b..556ab8a51f 100644
--- a/engines/zvision/animation_node.h
+++ b/engines/zvision/animation_node.h
@@ -32,10 +32,6 @@ namespace Common {
class String;
}
-namespace Video {
-class VideoDecoder;
-}
-
namespace Graphics {
struct Surface;
}
@@ -43,7 +39,7 @@ struct Surface;
namespace ZVision {
class ZVision;
-class RlfAnimation;
+class MetaAnimation;
class AnimationNode : public SideFX {
public:
@@ -62,26 +58,16 @@ public:
};
private:
- enum FileType {
- RLF = 1,
- AVI = 2
- };
-
-private:
typedef Common::List<playnode> PlayNodes;
PlayNodes _playList;
- union {
- RlfAnimation *rlf;
- Video::VideoDecoder *avi;
- } _animation;
-
- FileType _fileType;
- int32 _frmDelay;
int32 _mask;
bool _DisposeAfterUse;
+ MetaAnimation *_animation;
+ int32 _frmDelay;
+
public:
bool process(uint32 deltaTimeInMillis);