diff options
| author | Filippos Karapetis | 2014-12-13 15:28:22 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-16 01:58:53 +0200 |
| commit | 3315522ba1607d68c3402f3d1c8b51b7dc38a7dd (patch) | |
| tree | 0307f9ba768a6d473e1c046a8f81932c2fdcf936 /engines | |
| parent | 409ce79a35131d8538e3100e499366e43ae15d02 (diff) | |
| download | scummvm-rg350-3315522ba1607d68c3402f3d1c8b51b7dc38a7dd.tar.gz scummvm-rg350-3315522ba1607d68c3402f3d1c8b51b7dc38a7dd.tar.bz2 scummvm-rg350-3315522ba1607d68c3402f3d1c8b51b7dc38a7dd.zip | |
ZVISION: Move the RLF decoder
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/zvision/animation/meta_animation.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/core/events.cpp | 1 | ||||
| -rw-r--r-- | engines/zvision/module.mk | 2 | ||||
| -rw-r--r-- | engines/zvision/video/rlf_decoder.cpp (renamed from engines/zvision/animation/rlf_animation.cpp) | 2 | ||||
| -rw-r--r-- | engines/zvision/video/rlf_decoder.h (renamed from engines/zvision/animation/rlf_animation.h) | 4 |
5 files changed, 5 insertions, 6 deletions
diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp index 5a8dba6b9d..85b2e0f6b7 100644 --- a/engines/zvision/animation/meta_animation.cpp +++ b/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" diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp index 52d71c92f6..839f919ad6 100644 --- a/engines/zvision/core/events.cpp +++ b/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" diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index 045eb5264a..5c2fd2045b 100644 --- a/engines/zvision/module.mk +++ b/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 diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/video/rlf_decoder.cpp index eaf08a79f9..a4f16af9b0 100644 --- a/engines/zvision/animation/rlf_animation.cpp +++ b/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" diff --git a/engines/zvision/animation/rlf_animation.h b/engines/zvision/video/rlf_decoder.h index 62fa6099bf..dcfd8606c2 100644 --- a/engines/zvision/animation/rlf_animation.h +++ b/engines/zvision/video/rlf_decoder.h @@ -20,8 +20,8 @@ * */ -#ifndef ZVISION_RLF_ANIMATION_H -#define ZVISION_RLF_ANIMATION_H +#ifndef ZVISION_RLF_DECODER_H +#define ZVISION_RLF_DECODER_H #include "common/file.h" |