diff --git a/engines/zvision/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp similarity index 98% rename from engines/zvision/meta_animation.cpp rename to engines/zvision/animation/meta_animation.cpp index dddc2383793..38f56699bbd 100644 --- a/engines/zvision/meta_animation.cpp +++ b/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" diff --git a/engines/zvision/meta_animation.h b/engines/zvision/animation/meta_animation.h similarity index 98% rename from engines/zvision/meta_animation.h rename to engines/zvision/animation/meta_animation.h index 3754aae0583..2ea00310f91 100644 --- a/engines/zvision/meta_animation.h +++ b/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" diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp index ef088f75530..aac4e7b2bcc 100644 --- a/engines/zvision/core/console.cpp +++ b/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" diff --git a/engines/zvision/menu.cpp b/engines/zvision/core/menu.cpp similarity index 100% rename from engines/zvision/menu.cpp rename to engines/zvision/core/menu.cpp diff --git a/engines/zvision/search_manager.cpp b/engines/zvision/core/search_manager.cpp similarity index 99% rename from engines/zvision/search_manager.cpp rename to engines/zvision/core/search_manager.cpp index db120f2a4b5..fe99772b9b3 100644 --- a/engines/zvision/search_manager.cpp +++ b/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" diff --git a/engines/zvision/search_manager.h b/engines/zvision/core/search_manager.h similarity index 100% rename from engines/zvision/search_manager.h rename to engines/zvision/core/search_manager.h diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp index c9dc5d37b26..f3b01b7e30d 100644 --- a/engines/zvision/graphics/render_manager.cpp +++ b/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" diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index a386f6fac6c..9d5072a64d9 100644 --- a/engines/zvision/module.mk +++ b/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 diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 3c341fbc803..22fbd4ff161 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/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" diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp index ca707b5ab03..ba1b634d421 100644 --- a/engines/zvision/scripting/controls/input_control.cpp +++ b/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" diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h index 4a63f228a0f..6fcdb2ca54e 100644 --- a/engines/zvision/scripting/controls/input_control.h +++ b/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" diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp index 121fab97e1e..7e3ee775fb2 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/cursors/cursor_manager.h" -#include "zvision/meta_animation.h" +#include "zvision/animation/meta_animation.h" #include "zvision/utility/utility.h" #include "common/stream.h" diff --git a/engines/zvision/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp similarity index 99% rename from engines/zvision/slot_control.cpp rename to engines/zvision/scripting/controls/slot_control.cpp index d3d9c2ec4b8..c85b02b3cd5 100644 --- a/engines/zvision/slot_control.cpp +++ b/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" diff --git a/engines/zvision/slot_control.h b/engines/zvision/scripting/controls/slot_control.h similarity index 100% rename from engines/zvision/slot_control.h rename to engines/zvision/scripting/controls/slot_control.h diff --git a/engines/zvision/inventory_manager.cpp b/engines/zvision/scripting/inventory.cpp similarity index 100% rename from engines/zvision/inventory_manager.cpp rename to engines/zvision/scripting/inventory.cpp diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp index fff187d369a..5d697bd8411 100644 --- a/engines/zvision/scripting/scr_file_handling.cpp +++ b/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" diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp index 9713a347332..a27ae4dbf08 100644 --- a/engines/zvision/scripting/script_manager.cpp +++ b/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" diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h index a835c13951e..8ec364b35fb 100644 --- a/engines/zvision/scripting/script_manager.h +++ b/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" diff --git a/engines/zvision/sidefx.cpp b/engines/zvision/scripting/sidefx.cpp similarity index 96% rename from engines/zvision/sidefx.cpp rename to engines/zvision/scripting/sidefx.cpp index 7ba1959db76..c0b8a4d12fe 100644 --- a/engines/zvision/sidefx.cpp +++ b/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" diff --git a/engines/zvision/sidefx.h b/engines/zvision/scripting/sidefx.h similarity index 100% rename from engines/zvision/sidefx.h rename to engines/zvision/scripting/sidefx.h diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp similarity index 98% rename from engines/zvision/animation_node.cpp rename to engines/zvision/scripting/sidefx/animation_node.cpp index 49ef22bb511..4a606adc9e9 100644 --- a/engines/zvision/animation_node.cpp +++ b/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" diff --git a/engines/zvision/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h similarity index 98% rename from engines/zvision/animation_node.h rename to engines/zvision/scripting/sidefx/animation_node.h index ff7636a31f7..4d1c74bccfb 100644 --- a/engines/zvision/animation_node.h +++ b/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" diff --git a/engines/zvision/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp similarity index 99% rename from engines/zvision/music_node.cpp rename to engines/zvision/scripting/sidefx/music_node.cpp index f8fd08b285c..0351867dd90 100644 --- a/engines/zvision/music_node.cpp +++ b/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" diff --git a/engines/zvision/music_node.h b/engines/zvision/scripting/sidefx/music_node.h similarity index 98% rename from engines/zvision/music_node.h rename to engines/zvision/scripting/sidefx/music_node.h index 0dad22614b1..066b8f80f4a 100644 --- a/engines/zvision/music_node.h +++ b/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 { diff --git a/engines/zvision/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp similarity index 97% rename from engines/zvision/syncsound_node.cpp rename to engines/zvision/scripting/sidefx/syncsound_node.cpp index 7bd520d4758..2bfdc349d10 100644 --- a/engines/zvision/syncsound_node.cpp +++ b/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" diff --git a/engines/zvision/syncsound_node.h b/engines/zvision/scripting/sidefx/syncsound_node.h similarity index 97% rename from engines/zvision/syncsound_node.h rename to engines/zvision/scripting/sidefx/syncsound_node.h index 1f63ec48dda..c16ffebe7ff 100644 --- a/engines/zvision/syncsound_node.h +++ b/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 { diff --git a/engines/zvision/scripting/controls/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp similarity index 97% rename from engines/zvision/scripting/controls/timer_node.cpp rename to engines/zvision/scripting/sidefx/timer_node.cpp index e68610f537a..6e71101acd3 100644 --- a/engines/zvision/scripting/controls/timer_node.cpp +++ b/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" diff --git a/engines/zvision/scripting/controls/timer_node.h b/engines/zvision/scripting/sidefx/timer_node.h similarity index 97% rename from engines/zvision/scripting/controls/timer_node.h rename to engines/zvision/scripting/sidefx/timer_node.h index f6584becdab..7a26aff2513 100644 --- a/engines/zvision/scripting/controls/timer_node.h +++ b/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 { diff --git a/engines/zvision/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp similarity index 98% rename from engines/zvision/ttytext_node.cpp rename to engines/zvision/scripting/sidefx/ttytext_node.cpp index 6741d28a563..68636eb422c 100644 --- a/engines/zvision/ttytext_node.cpp +++ b/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" diff --git a/engines/zvision/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h similarity index 96% rename from engines/zvision/ttytext_node.h rename to engines/zvision/scripting/sidefx/ttytext_node.h index e25fdb0c072..a6326c733bd 100644 --- a/engines/zvision/ttytext_node.h +++ b/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 { diff --git a/engines/zvision/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp similarity index 97% rename from engines/zvision/subtitles.cpp rename to engines/zvision/subtitles/subtitles.cpp index da9b0fc1c90..4ca48f7b42b 100644 --- a/engines/zvision/subtitles.cpp +++ b/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 { diff --git a/engines/zvision/strings/string_manager.cpp b/engines/zvision/text/string_manager.cpp similarity index 99% rename from engines/zvision/strings/string_manager.cpp rename to engines/zvision/text/string_manager.cpp index 22331d8a246..cadfbf1f498 100644 --- a/engines/zvision/strings/string_manager.cpp +++ b/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" diff --git a/engines/zvision/strings/string_manager.h b/engines/zvision/text/string_manager.h similarity index 100% rename from engines/zvision/strings/string_manager.h rename to engines/zvision/text/string_manager.h diff --git a/engines/zvision/text.cpp b/engines/zvision/text/text.cpp similarity index 99% rename from engines/zvision/text.cpp rename to engines/zvision/text/text.cpp index 6b0ff0712bf..cad2723d136 100644 --- a/engines/zvision/text.cpp +++ b/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" diff --git a/engines/zvision/text.h b/engines/zvision/text/text.h similarity index 100% rename from engines/zvision/text.h rename to engines/zvision/text/text.h diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 580f8c4367d..0eb14257f26 100644 --- a/engines/zvision/zvision.cpp +++ b/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" diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index 2674df27e0b..db2c646fda8 100644 --- a/engines/zvision/zvision.h +++ b/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"