ZVISION: Move the RLF decoder

engines/zvision/animation/meta_animation.cpp

@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/animation/rlf_animation.h"
+#include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
 
 #include "video/video_decoder.h"

engines/zvision/core/events.cpp

@@ -28,7 +28,6 @@
 #include "zvision/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/animation/rlf_animation.h"
 #include "zvision/core/menu.h"
 #include "zvision/sound/zork_raw.h"
 

engines/zvision/module.mk

@@ -2,7 +2,6 @@ MODULE := engines/zvision
 
 MODULE_OBJS := \
 	animation/meta_animation.o \
-	animation/rlf_animation.o \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
@@ -48,6 +47,7 @@ MODULE_OBJS := \
 	utility/lzss_read_stream.o \
 	utility/utility.o \
 	utility/zfs_archive.o \
+	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o

engines/zvision/video/rlf_decoder.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/animation/rlf_animation.h"
+#include "zvision/video/rlf_decoder.h"
 
 #include "common/str.h"
 #include "common/file.h"

engines/zvision/video/rlf_decoder.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ZVISION_RLF_ANIMATION_H
+#ifndef ZVISION_RLF_DECODER_H
-#define ZVISION_RLF_ANIMATION_H
+#define ZVISION_RLF_DECODER_H
 
 #include "common/file.h"