diff options
| author | Filippos Karapetis | 2014-12-03 02:16:14 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-03 02:16:14 +0200 |
| commit | f2eee1759f922640b08ac3420f50f0a9c05e0588 (patch) | |
| tree | c7b79e3a72f41d51dfe13a096f6f1cee48d03d4d | |
| parent | f578a1b3342578594d9940894a525bf3983641ff (diff) | |
| download | scummvm-rg350-f2eee1759f922640b08ac3420f50f0a9c05e0588.tar.gz scummvm-rg350-f2eee1759f922640b08ac3420f50f0a9c05e0588.tar.bz2 scummvm-rg350-f2eee1759f922640b08ac3420f50f0a9c05e0588.zip | |
ZVISION: Move the ZfsArchive class
| -rw-r--r-- | engines/zvision/core/search_manager.cpp | 6 | ||||
| -rw-r--r-- | engines/zvision/module.mk | 2 | ||||
| -rw-r--r-- | engines/zvision/utility/zfs_archive.cpp (renamed from engines/zvision/archives/zfs_archive.cpp) | 5 | ||||
| -rw-r--r-- | engines/zvision/utility/zfs_archive.h (renamed from engines/zvision/archives/zfs_archive.h) | 0 | ||||
| -rw-r--r-- | engines/zvision/zvision.cpp | 3 |
5 files changed, 7 insertions, 9 deletions
diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp index 1e9643ddbb..9c5d8fb323 100644 --- a/engines/zvision/core/search_manager.cpp +++ b/engines/zvision/core/search_manager.cpp @@ -21,12 +21,12 @@ */ #include "common/debug.h" - -#include "zvision/core/search_manager.h" -#include "zvision/archives/zfs_archive.h" #include "common/fs.h" #include "common/stream.h" +#include "zvision/core/search_manager.h" +#include "zvision/utility/zfs_archive.h" + namespace ZVision { SearchManager::SearchManager(const Common::String &rootPath, int depth) { diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index 5efd6d4a29..607a9be4ed 100644 --- a/engines/zvision/module.mk +++ b/engines/zvision/module.mk @@ -3,7 +3,6 @@ MODULE := engines/zvision MODULE_OBJS := \ animation/meta_animation.o \ animation/rlf_animation.o \ - archives/zfs_archive.o \ core/console.o \ core/events.o \ core/menu.o \ @@ -48,6 +47,7 @@ MODULE_OBJS := \ utility/clock.o \ utility/lzss_read_stream.o \ utility/utility.o \ + utility/zfs_archive.o \ video/video.o \ video/zork_avi_decoder.o \ zvision.o diff --git a/engines/zvision/archives/zfs_archive.cpp b/engines/zvision/utility/zfs_archive.cpp index 416719b8f2..13b0168e1c 100644 --- a/engines/zvision/archives/zfs_archive.cpp +++ b/engines/zvision/utility/zfs_archive.cpp @@ -21,13 +21,12 @@ */ #include "common/scummsys.h" - -#include "zvision/archives/zfs_archive.h" - #include "common/memstream.h" #include "common/debug.h" #include "common/file.h" +#include "zvision/utility/zfs_archive.h" + namespace ZVision { ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) { diff --git a/engines/zvision/archives/zfs_archive.h b/engines/zvision/utility/zfs_archive.h index 571591a6d1..571591a6d1 100644 --- a/engines/zvision/archives/zfs_archive.h +++ b/engines/zvision/utility/zfs_archive.h diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 7a5e50f491..d981d14838 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -23,20 +23,19 @@ #include "common/scummsys.h" #include "zvision/zvision.h" - #include "zvision/core/console.h" #include "zvision/scripting/script_manager.h" #include "zvision/graphics/render_manager.h" #include "zvision/cursors/cursor_manager.h" #include "zvision/core/save_manager.h" #include "zvision/text/string_manager.h" -#include "zvision/archives/zfs_archive.h" #include "zvision/detection.h" #include "zvision/core/menu.h" #include "zvision/core/search_manager.h" #include "zvision/text/text.h" #include "zvision/fonts/truetype_font.h" #include "zvision/core/midi.h" +#include "zvision/utility/zfs_archive.h" #include "common/config-manager.h" #include "common/str.h" |