3 files changed, 201 insertions, 0 deletions
diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
new file mode 100644
index 0000000000..5da39e4583
--- /dev/null
+++ b/engines/zvision/animation_control.cpp
@@ -0,0 +1,122 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "video/video_decoder.h"
+
+#include "zvision/animation_control.h"
+#include "zvision/zvision.h"
+#include "zvision/render_manager.h"
+#include "zvision/script_manager.h"
+#include "zvision/rlf_animation.h"
+#include "zvision/zork_avi_decoder.h"
+
+
+namespace ZVision {
+
+AnimationControl::AnimationControl(ZVision *engine, uint32 controlKey, const Common::String &fileName)
+		: Control(engine, controlKey), 
+		  _fileType(RLF),
+		  _loopCount(1),
+		  _currentLoop(0),
+		  _accumulatedTime(0) {
+	if (fileName.hasSuffix(".rlf")) {
+		_fileType = RLF;
+		_animation.rlf = new RlfAnimation(fileName, false);
+	} else if (fileName.hasSuffix(".avi")) {
+		_fileType = AVI;
+		_animation.avi = new ZorkAVIDecoder();
+		_animation.avi->loadFile(fileName);
+	} else {
+		warning("Unrecognized animation file type: %s", fileName.c_str());
+	}
+}
+
+AnimationControl::~AnimationControl() {
+	if (_fileType == RLF) {
+		delete _animation.rlf;
+	} else if (_fileType == AVI) {
+		delete _animation.avi;
+	}
+}
+
+bool AnimationControl::process(uint32 deltaTimeInMillis) {
+	if (!_enabled) {
+		return false;
+	}
+
+	bool finished = false;
+
+	if (_fileType == RLF) {
+		_accumulatedTime += deltaTimeInMillis;
+
+		uint32 frameTime = _animation.rlf->frameTime();
+		if (_accumulatedTime >= frameTime) {
+			_accumulatedTime -= frameTime;
+
+			_engine->getRenderManager()->copyRectToWorkingWindow(_animation.rlf->getNextFrame(), _x, _y, _animation.rlf->width(), _animation.rlf->width(), _animation.rlf->height());
+
+			if (_animation.rlf->endOfAnimation()) {
+				_animation.rlf->seekToFrame(-1);
+				if (_loopCount > 0) {
+					_currentLoop++;
+					if (_currentLoop >= _loopCount) {
+						finished = true;
+					}
+				}
+			}
+		}
+	} else if (_fileType == AVI) {
+		if (!_animation.avi->isPlaying()) {
+			_animation.avi->start();
+		}
+
+		if (_animation.avi->needsUpdate()) {
+			const Graphics::Surface *frame = _animation.avi->decodeNextFrame();
+
+			if (frame) {
+				_engine->getRenderManager()->copyRectToWorkingWindow((const uint16 *)frame->getPixels(), _x, _y, frame->w, frame->w, frame->h);
+			}
+		}
+
+		if (_animation.avi->endOfVideo()) {
+			_animation.avi->rewind();
+			if (_loopCount > 0) {
+				_currentLoop++;
+				if (_currentLoop >= _loopCount) {
+					finished = true;
+				}
+			}
+		}
+	}
+
+	if (finished) {
+		_engine->getScriptManager()->setStateValue(_animationKey, 2);
+		disable();
+		_currentLoop = 0;
+	}
+
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/animation_control.h b/engines/zvision/animation_control.h
new file mode 100644
index 0000000000..036ce4b66b
--- /dev/null
+++ b/engines/zvision/animation_control.h
@@ -0,0 +1,78 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_ANIMATION_CONTROL_H
+#define ZVISION_ANIMATION_CONTROL_H
+
+#include "common/types.h"
+
+#include "zvision/control.h"
+
+
+namespace Video {
+class VideoDecoder;
+}
+
+namespace ZVision {
+
+class ZVision;
+class RlfAnimation;
+
+class AnimationControl : public Control {
+public:
+	AnimationControl(ZVision *engine, uint32 controlKey, const Common::String &fileName);
+	~AnimationControl();
+
+private:
+	enum FileType {
+		RLF = 1,
+		AVI = 2
+	};
+
+private:
+	uint32 _animationKey;
+	
+	union {
+		RlfAnimation *rlf;
+		Video::VideoDecoder *avi;
+	} _animation;
+
+	FileType _fileType;
+	uint _loopCount;
+	int32 _x;
+	int32 _y;
+
+	uint _accumulatedTime;
+	uint _currentLoop;
+
+public:
+	bool process(uint32 deltaTimeInMillis);
+
+	void setAnimationKey(uint32 animationKey) { _animationKey = animationKey; }
+	void setLoopCount(uint loopCount) { _loopCount = loopCount; }
+	void setXPos(int32 x) { _x = x; }
+	void setYPost(int32 y) { _y = y; }
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index c916ab81d3..814a4ba0c2 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/zvision
 MODULE_OBJS := \
 	actions.o \
 	animation.o \
+	animation_control.o \
 	clock.o \
 	console.o \
 	control.o \