ZVISION: Update includes to use the new file structure

This commit is contained in:
RichieSams 2013-11-01 00:58:43 -05:00
parent 5842c5098f
commit e50797d6b1
40 changed files with 133 additions and 133 deletions

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/rlf_animation.h"
#include "zvision/animation/rlf_animation.h"
#include "common/str.h"
#include "common/file.h"

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/zfs_archive.h"
#include "zvision/archives/zfs_archive.h"
#include "common/memstream.h"
#include "common/debug.h"

View File

@ -22,16 +22,16 @@
#include "common/scummsys.h"
#include "zvision/console.h"
#include "zvision/core/console.h"
#include "zvision/zvision.h"
#include "zvision/script_manager.h"
#include "zvision/render_manager.h"
#include "zvision/string_manager.h"
#include "zvision/zork_avi_decoder.h"
#include "zvision/zork_raw.h"
#include "zvision/utility.h"
#include "zvision/cursor.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/strings/string_manager.h"
#include "zvision/video/zork_avi_decoder.h"
#include "zvision/sound/zork_raw.h"
#include "zvision/utility/utility.h"
#include "zvision/cursors/cursor.h"
#include "common/system.h"
#include "common/file.h"

View File

@ -24,11 +24,11 @@
#include "zvision/zvision.h"
#include "zvision/console.h"
#include "zvision/cursor_manager.h"
#include "zvision/render_manager.h"
#include "zvision/script_manager.h"
#include "zvision/rlf_animation.h"
#include "zvision/core/console.h"
#include "zvision/cursors/cursor_manager.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/animation/rlf_animation.h"
#include "common/events.h"
#include "common/system.h"

View File

@ -22,11 +22,11 @@
#include "common/scummsys.h"
#include "zvision/save_manager.h"
#include "zvision/core/save_manager.h"
#include "zvision/zvision.h"
#include "zvision/script_manager.h"
#include "zvision/render_manager.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h"
#include "common/system.h"

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/cursor.h"
#include "zvision/cursors/cursor.h"
#include "common/str.h"
#include "common/file.h"

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/cursor_manager.h"
#include "zvision/cursors/cursor_manager.h"
#include "zvision/zvision.h"

View File

@ -23,7 +23,7 @@
#ifndef ZVISION_CURSOR_MANAGER_H
#define ZVISION_CURSOR_MANAGER_H
#include "zvision/cursor.h"
#include "zvision/cursors/cursor.h"
#include "common/str.h"

View File

@ -22,10 +22,10 @@
#include "common/scummsys.h"
#include "zvision/truetype_font.h"
#include "zvision/fonts/truetype_font.h"
#include "zvision/zvision.h"
#include "zvision/render_manager.h"
#include "zvision/graphics/render_manager.h"
#include "common/debug.h"
#include "common/file.h"

View File

@ -22,9 +22,9 @@
#include "common/scummsys.h"
#include "zvision/render_manager.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/lzss_read_stream.h"
#include "zvision/utility/lzss_read_stream.h"
#include "common/file.h"
#include "common/system.h"

View File

@ -23,8 +23,8 @@
#ifndef ZVISION_RENDER_MANAGER_H
#define ZVISION_RENDER_MANAGER_H
#include "zvision/render_table.h"
#include "zvision/truetype_font.h"
#include "zvision/graphics/render_table.h"
#include "zvision/fonts/truetype_font.h"
#include "common/rect.h"
#include "common/hashmap.h"

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/render_table.h"
#include "zvision/graphics/render_table.h"
#include "common/rect.h"

View File

@ -1,36 +1,36 @@
MODULE := engines/zvision
MODULE_OBJS := \
actions.o \
animation_control.o \
clock.o \
console.o \
control.o \
cursor.o \
cursor_manager.o \
animation/rlf_animation.o \
archives/zfs_archive.o \
core/console.o \
core/events.o \
core/save_manager.o \
cursors/cursor.o \
cursors/cursor_manager.o \
detection.o \
events.o \
input_control.o \
lever_control.o \
lzss_read_stream.o \
push_toggle_control.o \
render_manager.o \
render_table.o \
rlf_animation.o \
save_manager.o \
scr_file_handling.o \
script_manager.o \
single_value_container.o \
string_manager.o \
timer_node.o \
truetype_font.o \
utility.o \
video.o \
zvision.o \
zfs_archive.o \
zork_avi_decoder.o \
zork_raw.o
fonts/truetype_font.o \
graphics/render_manager.o \
graphics/render_table.o \
scripting/actions.o \
scripting/control.o \
scripting/controls/animation_control.o \
scripting/controls/input_control.o \
scripting/controls/lever_control.o \
scripting/controls/push_toggle_control.o \
scripting/controls/timer_node.o \
scripting/scr_file_handling.o \
scripting/script_manager.o \
sound/zork_raw.o \
strings/string_manager.o \
utility/clock.o \
utility/lzss_read_stream.o \
utility/single_value_container.o \
utility/utility.o \
video/video.o \
video/zork_avi_decoder.o \
zvision.o
MODULE_DIRS += \
engines/zvision

View File

@ -22,15 +22,15 @@
#include "common/scummsys.h"
#include "zvision/actions.h"
#include "zvision/scripting/actions.h"
#include "zvision/zvision.h"
#include "zvision/script_manager.h"
#include "zvision/render_manager.h"
#include "zvision/zork_raw.h"
#include "zvision/zork_avi_decoder.h"
#include "zvision/timer_node.h"
#include "zvision/animation_control.h"
#include "zvision/scripting/script_manager.h"
#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/scripting/controls/animation_control.h"
#include "common/file.h"

View File

@ -22,11 +22,11 @@
#include "common/scummsys.h"
#include "zvision/control.h"
#include "zvision/scripting/control.h"
#include "zvision/zvision.h"
#include "zvision/render_manager.h"
#include "zvision/utility.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h"
#include "common/stream.h"

View File

@ -22,13 +22,13 @@
#include "common/scummsys.h"
#include "zvision/animation_control.h"
#include "zvision/scripting/controls/animation_control.h"
#include "zvision/zvision.h"
#include "zvision/render_manager.h"
#include "zvision/script_manager.h"
#include "zvision/rlf_animation.h"
#include "zvision/zork_avi_decoder.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/animation/rlf_animation.h"
#include "zvision/video/zork_avi_decoder.h"
#include "video/video_decoder.h"

View File

@ -23,7 +23,7 @@
#ifndef ZVISION_ANIMATION_CONTROL_H
#define ZVISION_ANIMATION_CONTROL_H
#include "zvision/control.h"
#include "zvision/scripting/control.h"
namespace Common {

View File

@ -22,13 +22,13 @@
#include "common/scummsys.h"
#include "zvision/input_control.h"
#include "zvision/scripting/controls/input_control.h"
#include "zvision/zvision.h"
#include "zvision/script_manager.h"
#include "zvision/string_manager.h"
#include "zvision/render_manager.h"
#include "zvision/utility.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/strings/string_manager.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h"
#include "common/str.h"
#include "common/stream.h"

View File

@ -23,8 +23,8 @@
#ifndef ZVISION_INPUT_CONTROL_H
#define ZVISION_INPUT_CONTROL_H
#include "zvision/control.h"
#include "zvision/string_manager.h"
#include "zvision/scripting/control.h"
#include "zvision/strings/string_manager.h"
#include "common/rect.h"

View File

@ -22,15 +22,15 @@
#include "common/scummsys.h"
#include "zvision/lever_control.h"
#include "zvision/scripting/controls/lever_control.h"
#include "zvision/zvision.h"
#include "zvision/script_manager.h"
#include "zvision/render_manager.h"
#include "zvision/cursor_manager.h"
#include "zvision/rlf_animation.h"
#include "zvision/zork_avi_decoder.h"
#include "zvision/utility.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/cursors/cursor_manager.h"
#include "zvision/animation/rlf_animation.h"
#include "zvision/video/zork_avi_decoder.h"
#include "zvision/utility/utility.h"
#include "common/stream.h"
#include "common/file.h"

View File

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

View File

@ -22,12 +22,12 @@
#include "common/scummsys.h"
#include "zvision/push_toggle_control.h"
#include "zvision/scripting/controls/push_toggle_control.h"
#include "zvision/zvision.h"
#include "zvision/script_manager.h"
#include "zvision/cursor_manager.h"
#include "zvision/utility.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/cursors/cursor_manager.h"
#include "zvision/utility/utility.h"
#include "common/stream.h"

View File

@ -23,7 +23,7 @@
#ifndef ZVISION_PUSH_TOGGLE_CONTROL_H
#define ZVISION_PUSH_TOGGLE_CONTROL_H
#include "zvision/control.h"
#include "zvision/scripting/control.h"
#include "common/rect.h"

View File

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

View File

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

View File

@ -23,7 +23,7 @@
#ifndef ZVISION_PUZZLE_H
#define ZVISION_PUZZLE_H
#include "zvision/actions.h"
#include "zvision/scripting/actions.h"
#include "common/list.h"
#include "common/ptr.h"

View File

@ -22,13 +22,13 @@
#include "common/scummsys.h"
#include "zvision/script_manager.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/utility.h"
#include "zvision/puzzle.h"
#include "zvision/actions.h"
#include "zvision/push_toggle_control.h"
#include "zvision/lever_control.h"
#include "zvision/utility/utility.h"
#include "zvision/scripting/puzzle.h"
#include "zvision/scripting/actions.h"
#include "zvision/scripting/controls/push_toggle_control.h"
#include "zvision/scripting/controls/lever_control.h"
#include "common/textconsole.h"
#include "common/file.h"

View File

@ -22,14 +22,14 @@
#include "common/scummsys.h"
#include "zvision/script_manager.h"
#include "zvision/scripting/script_manager.h"
#include "zvision/zvision.h"
#include "zvision/render_manager.h"
#include "zvision/cursor_manager.h"
#include "zvision/save_manager.h"
#include "zvision/actions.h"
#include "zvision/utility.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/cursors/cursor_manager.h"
#include "zvision/core/save_manager.h"
#include "zvision/scripting/actions.h"
#include "zvision./utility/utility.h"
#include "common/algorithm.h"
#include "common/hashmap.h"

View File

@ -23,8 +23,8 @@
#ifndef ZVISION_SCRIPT_MANAGER_H
#define ZVISION_SCRIPT_MANAGER_H
#include "zvision/puzzle.h"
#include "zvision/control.h"
#include "zvision/scripting/puzzle.h"
#include "zvision/scripting/control.h"
#include "common/hashmap.h"
#include "common/queue.h"

View File

@ -22,11 +22,11 @@
#include "common/scummsys.h"
#include "zvision/zork_raw.h"
#include "zvision/sound/zork_raw.h"
#include "zvision/zvision.h"
#include "zvision/detection.h"
#include "zvision/utility.h"
#include "zvision/utility/utility.h"
#include "common/file.h"
#include "common/str.h"

View File

@ -22,9 +22,9 @@
#include "common/scummsys.h"
#include "zvision/string_manager.h"
#include "zvision/strings/string_manager.h"
#include "zvision/truetype_font.h"
#include "zvision/fonts/truetype_font.h"
#include "common/file.h"
#include "common/tokenizer.h"

View File

@ -25,7 +25,7 @@
#define ZVISION_STRING_MANAGER_H
#include "zvision/detection.h"
#include "zvision/truetype_font.h"
#include "zvision/fonts/truetype_font.h"
namespace Graphics {

View File

@ -23,7 +23,7 @@
#include "common/scummsys.h"
#include "zvision/clock.h"
#include "zvision/utility/clock.h"
#include "common/system.h"

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/lzss_read_stream.h"
#include "zvision/utility/lzss_read_stream.h"
namespace ZVision {

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#include "zvision/single_value_container.h"
#include "zvision/utility/single_value_container.h"
#include "common/textconsole.h"
#include "common/str.h"

View File

@ -22,10 +22,10 @@
#include "common/scummsys.h"
#include "zvision/utility.h"
#include "zvision/utility/utility.h"
#include "zvision/zvision.h"
#include "zvision/zork_raw.h"
#include "zvision/sound/zork_raw.h"
#include "common/tokenizer.h"
#include "common/file.h"

View File

@ -24,8 +24,8 @@
#include "zvision/zvision.h"
#include "zvision/clock.h"
#include "zvision/render_manager.h"
#include "zvision/utility/clock.h"
#include "zvision/graphics/render_manager.h"
#include "common/system.h"

View File

@ -23,9 +23,9 @@
#include "common/scummsys.h"
#include "zvision/zork_avi_decoder.h"
#include "zvision/video/zork_avi_decoder.h"
#include "zvision/zork_raw.h"
#include "zvision/sound/zork_raw.h"
#include "common/stream.h"

View File

@ -24,13 +24,13 @@
#include "zvision/zvision.h"
#include "zvision/console.h"
#include "zvision/script_manager.h"
#include "zvision/render_manager.h"
#include "zvision/cursor_manager.h"
#include "zvision/save_manager.h"
#include "zvision/string_manager.h"
#include "zvision/zfs_archive.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/strings/string_manager.h"
#include "zvision/archives/zfs_archive.h"
#include "zvision/detection.h"
#include "common/config-manager.h"

View File

@ -25,7 +25,7 @@
#define ZVISION_ZVISION_H
#include "zvision/detection.h"
#include "zvision/clock.h"
#include "zvision/utility/clock.h"
#include "common/random.h"
#include "common/events.h"