ZVISION: Move all the remaining utility classes into the core

22 files changed, 21 insertions, 21 deletions

diff --git a/engines/zvision/utility/clock.cpp b/engines/zvision/core/clock.cpp
index 0e800a2031..1425d550b7 100644
--- a/engines/zvision/utility/clock.cpp
+++ b/engines/zvision/core/clock.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/utility/clock.h"
+#include "zvision/core/clock.h"
 
 #include "common/system.h"
 
diff --git a/engines/zvision/utility/clock.h b/engines/zvision/core/clock.h
index cbf52be560..cbf52be560 100644
--- a/engines/zvision/utility/clock.h
+++ b/engines/zvision/core/clock.h
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 76481a3549..eb4d281813 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -30,7 +30,7 @@
 #include "zvision/text/string_manager.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/sound/zork_raw.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/graphics/cursors/cursor.h"
 
 #include "common/system.h"
diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/core/utility.cpp
index e09545a90d..dcbb41171e 100644
--- a/engines/zvision/utility/utility.cpp
+++ b/engines/zvision/core/utility.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "zvision/zvision.h"
 #include "zvision/sound/zork_raw.h"
diff --git a/engines/zvision/utility/utility.h b/engines/zvision/core/utility.h
index 0ca26b968d..0ca26b968d 100644
--- a/engines/zvision/utility/utility.h
+++ b/engines/zvision/core/utility.h
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 1d89e22584..18923eeb8f 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -2,9 +2,11 @@ MODULE := engines/zvision
 
 MODULE_OBJS := \
 	core/console.o \
+	core/clock.o \
 	core/events.o \
 	core/menu.o \
 	core/save_manager.o \
+	core/utility.o \
 	detection.o \
 	file/lzss_read_stream.o \
 	file/search_manager.o \
@@ -44,8 +46,6 @@ MODULE_OBJS := \
 	sound/zork_raw.o \
 	text/string_manager.o \
 	text/text.o \
-	utility/clock.o \
-	utility/utility.o \
 	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index 5469106928..86f6a30c8f 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -27,7 +27,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 887ad7950d..40d016f360 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/scripting/controls/fist_control.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/video/rlf_decoder.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index b2c9cdd577..4a6d2705b4 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 1b15eacd78..e17a5f6dd8 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -29,7 +29,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/str.h"
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 07eec1fb63..632554e7f2 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index 0ef7618b5b..24306bf4db 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index fcd8cd0356..28c791168a 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 8135eb34cc..cb754ecbe2 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index d773b5fc6f..7de138d8e3 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -24,7 +24,7 @@
 
 #include "zvision/scripting/controls/input_control.h"
 #include "zvision/scripting/controls/save_control.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 7f04c2d311..63578d54ea 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index f0126bebc2..af26aed952 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/text/text.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index f97eed6b75..631cb6128e 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -25,7 +25,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/scripting/puzzle.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/controls/push_toggle_control.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index c735fe6eb0..605d27216e 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -29,7 +29,7 @@
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/scripting/actions.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 
 #include "common/algorithm.h"
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index c26c33a392..d8fabc419b 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -34,7 +34,7 @@
 #include "zvision/sound/zork_raw.h"
 #include "zvision/zvision.h"
 #include "zvision/detection.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index c8f968d975..189fb22194 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -27,7 +27,7 @@
 #include "graphics/surface.h"
 
 #include "zvision/zvision.h"
-#include "zvision/utility/clock.h"
+#include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 55dddd4f21..78c1c824a1 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -25,7 +25,7 @@
 #define ZVISION_ZVISION_H
 
 #include "zvision/detection.h"
-#include "zvision/utility/clock.h"
+#include "zvision/core/clock.h"
 #include "zvision/file/search_manager.h"
 
 #include "common/random.h"