ZVISION: Reorgonize source files into directories.

engines/zvision/animation/meta_animation.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/meta_animation.h"
+#include "zvision/animation/meta_animation.h"
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"

engines/zvision/animation/meta_animation.h

@@ -23,7 +23,7 @@
 #ifndef ZVISION_METAANIM_NODE_H
 #define ZVISION_METAANIM_NODE_H
 
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 #include "zvision/zvision.h"
 #include "common/rect.h"
 #include "common/list.h"

engines/zvision/core/console.cpp

@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/utility/utility.h"

engines/zvision/core/search_manager.cpp

@@ -21,7 +21,7 @@
 */
 #include "common/debug.h"
 
-#include "zvision/search_manager.h"
+#include "zvision/core/search_manager.h"
 #include "zvision/archives/zfs_archive.h"
 #include "common/fs.h"
 #include "common/stream.h"

engines/zvision/graphics/render_manager.cpp

@@ -24,7 +24,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/text.h"
+#include "zvision/text/text.h"
 
 #include "zvision/utility/lzss_read_stream.h"
 

engines/zvision/module.mk

@@ -1,46 +1,46 @@
 MODULE := engines/zvision
  
 MODULE_OBJS := \
-	scripting/actions.o \
-	animation_node.o \
-	utility/clock.o \
+	animation/meta_animation.o \
+	animation/rlf_animation.o \
+	archives/zfs_archive.o \
 	core/console.o \
-	scripting/control.o \
-	cursors/cursor.o \
-	cursors/cursor_manager.o \
-	detection.o \
 	core/events.o \
-	scripting/controls/input_control.o \
-	scripting/controls/lever_control.o \
-	utility/lzss_read_stream.o \
-	scripting/controls/push_toggle_control.o \
+	core/menu.o \
+	core/save_manager.o \
+	core/search_manager.o \
+	cursors/cursor_manager.o \
+	cursors/cursor.o \
+	detection.o \
+	fonts/truetype_font.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
-	animation/rlf_animation.o \
-	core/save_manager.o \
+	scripting/actions.o \
+	scripting/control.o \
+	scripting/controls/input_control.o \
+	scripting/controls/lever_control.o \
+	scripting/controls/push_toggle_control.o \
+	scripting/controls/slot_control.o \
+	scripting/inventory.o \
 	scripting/scr_file_handling.o \
 	scripting/script_manager.o \
+	scripting/sidefx.o \
+	scripting/sidefx/animation_node.o \
+	scripting/sidefx/music_node.o \
+	scripting/sidefx/syncsound_node.o \
+	scripting/sidefx/timer_node.o \
+	scripting/sidefx/ttytext_node.o \
+	sound/zork_raw.o \
+	subtitles/subtitles.o \
+	text/string_manager.o \
+	text/text.o \
+	utility/clock.o \
+	utility/lzss_read_stream.o \
 	utility/single_value_container.o \
-	strings/string_manager.o \
-	scripting/controls/timer_node.o \
-	fonts/truetype_font.o \
 	utility/utility.o \
 	video/video.o \
-	zvision.o \
-	archives/zfs_archive.o \
 	video/zork_avi_decoder.o \
-	sound/zork_raw.o \
-	sidefx.o \
-	music_node.o \
-	inventory_manager.o \
-	slot_control.o \
-	menu.o \
-	meta_animation.o \
-	search_manager.o \
-	text.o \
-	subtitles.o \
-	syncsound_node.o \
-	ttytext_node.o
+	zvision.o 
  
 MODULE_DIRS += \
 	engines/zvision

engines/zvision/scripting/actions.cpp

@@ -29,11 +29,11 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/video/zork_avi_decoder.h"
-#include "zvision/scripting/controls/timer_node.h"
-#include "zvision/music_node.h"
-#include "zvision/syncsound_node.h"
-#include "zvision/animation_node.h"
-#include "zvision/ttytext_node.h"
+#include "zvision/scripting/sidefx/timer_node.h"
+#include "zvision/scripting/sidefx/music_node.h"
+#include "zvision/scripting/sidefx/syncsound_node.h"
+#include "zvision/scripting/sidefx/animation_node.h"
+#include "zvision/scripting/sidefx/ttytext_node.h"
 
 #include "common/file.h"
 

engines/zvision/scripting/controls/input_control.cpp

@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/utility/utility.h"
 

engines/zvision/scripting/controls/input_control.h

@@ -24,7 +24,7 @@
 #define ZVISION_INPUT_CONTROL_H
 
 #include "zvision/scripting/control.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 
 #include "common/rect.h"
 

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/cursors/cursor_manager.h"
-#include "zvision/meta_animation.h"
+#include "zvision/animation/meta_animation.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"

engines/zvision/scripting/controls/slot_control.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/slot_control.h"
+#include "zvision/scripting/controls/slot_control.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"

engines/zvision/scripting/scr_file_handling.cpp

@@ -30,7 +30,7 @@
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/controls/push_toggle_control.h"
 #include "zvision/scripting/controls/lever_control.h"
-#include "zvision/slot_control.h"
+#include "zvision/scripting/controls/slot_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"

engines/zvision/scripting/script_manager.cpp

@@ -30,7 +30,7 @@
 #include "zvision/core/save_manager.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/utility/utility.h"
-#include "zvision/scripting/controls/timer_node.h"
+#include "zvision/scripting/sidefx/timer_node.h"
 
 #include "common/algorithm.h"
 #include "common/hashmap.h"

engines/zvision/scripting/script_manager.h

@@ -25,7 +25,7 @@
 
 #include "zvision/scripting/puzzle.h"
 #include "zvision/scripting/control.h"
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 
 #include "common/hashmap.h"
 #include "common/queue.h"

engines/zvision/scripting/sidefx.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"

engines/zvision/scripting/sidefx/animation_node.cpp

@@ -22,12 +22,12 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/animation_node.h"
+#include "zvision/scripting/sidefx/animation_node.h"
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/meta_animation.h"
+#include "zvision/animation/meta_animation.h"
 
 #include "graphics/surface.h"
 

engines/zvision/scripting/sidefx/animation_node.h

@@ -23,7 +23,7 @@
 #ifndef ZVISION_ANIMATION_NODE_H
 #define ZVISION_ANIMATION_NODE_H
 
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 #include "common/rect.h"
 #include "common/list.h"
 

engines/zvision/scripting/sidefx/music_node.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/music_node.h"
+#include "zvision/scripting/sidefx/music_node.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"

engines/zvision/scripting/sidefx/music_node.h

@@ -24,7 +24,7 @@
 #define ZVISION_MUSIC_NODE_H
 
 #include "audio/mixer.h"
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 #include "zvision/subtitles/subtitles.h"
 
 namespace Common {

engines/zvision/scripting/sidefx/syncsound_node.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/syncsound_node.h"
+#include "zvision/scripting/sidefx/syncsound_node.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"

engines/zvision/scripting/sidefx/syncsound_node.h

@@ -24,7 +24,7 @@
 #define ZVISION_SYNCSOUND_NODE_H
 
 #include "audio/mixer.h"
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 #include "zvision/subtitles/subtitles.h"
 
 namespace Common {

engines/zvision/scripting/sidefx/timer_node.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/scripting/controls/timer_node.h"
+#include "zvision/scripting/sidefx/timer_node.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"

engines/zvision/scripting/sidefx/timer_node.h

@@ -23,7 +23,7 @@
 #ifndef ZVISION_TIMER_NODE_H
 #define ZVISION_TIMER_NODE_H
 
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 
 namespace ZVision {
 

engines/zvision/scripting/sidefx/ttytext_node.cpp

@@ -22,12 +22,12 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/ttytext_node.h"
+#include "zvision/scripting/sidefx/ttytext_node.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/text.h"
+#include "zvision/text/text.h"
 
 #include "common/stream.h"
 #include "common/file.h"

engines/zvision/scripting/sidefx/ttytext_node.h

@@ -26,8 +26,8 @@
 #include "common/rect.h"
 #include "graphics/surface.h"
 
-#include "zvision/sidefx.h"
-#include "zvision/text.h"
+#include "zvision/scripting/sidefx.h"
+#include "zvision/text/text.h"
 #include "zvision/fonts/truetype_font.h"
 
 namespace Common {

engines/zvision/subtitles/subtitles.cpp

@@ -22,8 +22,8 @@
 
 #include "zvision/subtitles/subtitles.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/search_manager.h"
-#include "zvision/text.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/text.h"
 
 namespace ZVision {
 

engines/zvision/text/string_manager.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 
 #include "zvision/fonts/truetype_font.h"
 

engines/zvision/text/text.cpp

@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/text.h"
+#include "zvision/text/text.h"
 
 #include "zvision/fonts/truetype_font.h"
 

engines/zvision/zvision.cpp

@@ -29,12 +29,12 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
-#include "zvision/strings/string_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/search_manager.h"
-#include "zvision/text.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/text.h"
 #include "zvision/fonts/truetype_font.h"
 
 #include "common/config-manager.h"

engines/zvision/zvision.h

@@ -26,7 +26,7 @@
 
 #include "zvision/detection.h"
 #include "zvision/utility/clock.h"
-#include "zvision/search_manager.h"
+#include "zvision/core/search_manager.h"
 
 #include "common/random.h"
 #include "common/events.h"