aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision/lever_control.h
diff options
context:
space:
mode:
authorMarisa-Chan2014-01-17 16:56:49 +0700
committerMarisa-Chan2014-01-17 16:56:49 +0700
commit9c9f59d57060617d1acec71bd0d4066504f17c7a (patch)
tree76841b43ac518225c1715ebfada75a6d86b701c3 /engines/zvision/lever_control.h
parentff2a20889cfead5075c252dd5cdcdba658a40844 (diff)
downloadscummvm-rg350-9c9f59d57060617d1acec71bd0d4066504f17c7a.tar.gz
scummvm-rg350-9c9f59d57060617d1acec71bd0d4066504f17c7a.tar.bz2
scummvm-rg350-9c9f59d57060617d1acec71bd0d4066504f17c7a.zip
ZVISION: Move lever code to use MetaAnimation.
Diffstat (limited to 'engines/zvision/lever_control.h')
-rw-r--r--engines/zvision/lever_control.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 19ecc7b9ac..591d64e949 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -32,7 +32,7 @@
namespace ZVision {
class ZorkAVIDecoder;
-class RlfAnimation;
+class MetaAnimation;
class LeverControl : public Control {
public:
@@ -40,10 +40,6 @@ public:
~LeverControl();
private:
- enum FileType {
- RLF = 1,
- AVI = 2
- };
struct Direction {
Direction(uint a, uint t) : angle(a), toFrame(t) {}
@@ -64,11 +60,7 @@ private:
};
private:
- union {
- RlfAnimation *rlf;
- ZorkAVIDecoder *avi;
- } _animation;
- FileType _fileType;
+ MetaAnimation *_animation;
Common::String _cursorName;
Common::Rect _animationCoords;