aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-26 04:03:20 +0200
committerFilippos Karapetis2014-12-26 04:03:20 +0200
commit4d0ebfaa2285e2741a134db36fb4f5bd0317784d (patch)
tree30cf5b4da71ad7ab3da987ab65c6431f9373dd17 /engines
parent00a252fdc561b31379ddc5f568121b8040986add (diff)
downloadscummvm-rg350-4d0ebfaa2285e2741a134db36fb4f5bd0317784d.tar.gz
scummvm-rg350-4d0ebfaa2285e2741a134db36fb4f5bd0317784d.tar.bz2
scummvm-rg350-4d0ebfaa2285e2741a134db36fb4f5bd0317784d.zip
ZVISION: Move the save manager together with the other file classes
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/detection.cpp2
-rw-r--r--engines/zvision/file/save_manager.cpp (renamed from engines/zvision/core/save_manager.cpp)2
-rw-r--r--engines/zvision/file/save_manager.h (renamed from engines/zvision/core/save_manager.h)0
-rw-r--r--engines/zvision/module.mk2
-rw-r--r--engines/zvision/scripting/actions.cpp2
-rw-r--r--engines/zvision/scripting/controls/save_control.cpp2
-rw-r--r--engines/zvision/scripting/script_manager.cpp2
-rw-r--r--engines/zvision/zvision.cpp2
8 files changed, 7 insertions, 7 deletions
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index ebf5bdcfdd..b8d6a74eee 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -26,7 +26,7 @@
#include "zvision/zvision.h"
#include "zvision/detection.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
#include "zvision/scripting/script_manager.h"
#include "common/translation.h"
diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index b45742154d..05df834497 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -22,8 +22,8 @@
#include "common/scummsys.h"
-#include "zvision/core/save_manager.h"
#include "zvision/zvision.h"
+#include "zvision/file/save_manager.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h"
diff --git a/engines/zvision/core/save_manager.h b/engines/zvision/file/save_manager.h
index 75841331e7..75841331e7 100644
--- a/engines/zvision/core/save_manager.h
+++ b/engines/zvision/file/save_manager.h
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 6955d62534..8edd67b352 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -4,9 +4,9 @@ MODULE_OBJS := \
core/console.o \
core/clock.o \
core/events.o \
- core/save_manager.o \
detection.o \
file/lzss_read_stream.o \
+ file/save_manager.o \
file/search_manager.o \
file/zfs_archive.o \
graphics/cursors/cursor_manager.o \
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index be2079736e..ebbd09c8b9 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -29,6 +29,7 @@
#include "zvision/graphics/render_manager.h"
#include "zvision/sound/zork_raw.h"
#include "zvision/video/zork_avi_decoder.h"
+#include "zvision/file/save_manager.h"
#include "zvision/scripting/sidefx/timer_node.h"
#include "zvision/scripting/sidefx/music_node.h"
#include "zvision/scripting/sidefx/syncsound_node.h"
@@ -42,7 +43,6 @@
#include "zvision/graphics/effects/fog.h"
#include "zvision/graphics/effects/light.h"
#include "zvision/graphics/effects/wave.h"
-#include "zvision/core/save_manager.h"
#include "zvision/graphics/cursors/cursor_manager.h"
#include "common/file.h"
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index b35611feca..3a4dc47fe8 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -29,7 +29,7 @@
#include "zvision/scripting/script_manager.h"
#include "zvision/text/string_manager.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
#include "common/str.h"
#include "common/stream.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 4c1e69072d..2a4aa5fed0 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -27,7 +27,7 @@
#include "zvision/zvision.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
#include "zvision/scripting/actions.h"
#include "zvision/scripting/sidefx/timer_node.h"
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f692969942..11e417d4ac 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -27,7 +27,7 @@
#include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
#include "zvision/text/string_manager.h"
#include "zvision/detection.h"
#include "zvision/scripting/menu.h"