thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZVISION: Update includes to use the new file structure

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
engines/zvision/animation/rlf_animation.cpp
View file

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

2
engines/zvision/archives/zfs_archive.cpp
View file

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

16
engines/zvision/core/console.cpp
View file

@ -22,16 +22,16 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "zvision/console.h" #include "zvision/core/console.h"
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/string_manager.h" #include "zvision/strings/string_manager.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 "zvision/utility.h" #include "zvision/utility/utility.h"
#include "zvision/cursor.h" #include "zvision/cursors/cursor.h"
#include "common/system.h" #include "common/system.h"
#include "common/file.h" #include "common/file.h"

10
engines/zvision/core/events.cpp
View file

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

6
engines/zvision/core/save_manager.cpp
View file

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

2
engines/zvision/cursors/cursor.cpp
View file

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

2
engines/zvision/cursors/cursor_manager.cpp
View file

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

2
engines/zvision/cursors/cursor_manager.h
View file

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

4
engines/zvision/fonts/truetype_font.cpp
View file

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

4
engines/zvision/graphics/render_manager.cpp
View file

@ -22,9 +22,9 @@
#include "common/scummsys.h" #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/file.h"
#include "common/system.h" #include "common/system.h"

4
engines/zvision/graphics/render_manager.h
View file

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

2
engines/zvision/graphics/render_table.cpp
View file

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

58
engines/zvision/module.mk
View file

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

14
engines/zvision/scripting/actions.cpp
View file

@ -22,15 +22,15 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "zvision/actions.h" #include "zvision/scripting/actions.h"
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/zork_raw.h" #include "zvision/sound/zork_raw.h"
#include "zvision/zork_avi_decoder.h" #include "zvision/video/zork_avi_decoder.h"
#include "zvision/timer_node.h" #include "zvision/scripting/controls/timer_node.h"
#include "zvision/animation_control.h" #include "zvision/scripting/controls/animation_control.h"
#include "common/file.h" #include "common/file.h"

6
engines/zvision/scripting/control.cpp
View file

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

10
engines/zvision/scripting/controls/animation_control.cpp
View file

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

2
engines/zvision/scripting/controls/animation_control.h
View file

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

10
engines/zvision/scripting/controls/input_control.cpp
View file

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

4
engines/zvision/scripting/controls/input_control.h
View file

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

14
engines/zvision/scripting/controls/lever_control.cpp
View file

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

2
engines/zvision/scripting/controls/lever_control.h
View file

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

8
engines/zvision/scripting/controls/push_toggle_control.cpp
View file

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

2
engines/zvision/scripting/controls/push_toggle_control.h
View file

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

4
engines/zvision/scripting/controls/timer_node.cpp
View file

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

2
engines/zvision/scripting/controls/timer_node.h
View file

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

2
engines/zvision/scripting/puzzle.h
View file

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

12
engines/zvision/scripting/scr_file_handling.cpp
View file

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

12
engines/zvision/scripting/script_manager.cpp
View file

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

4
engines/zvision/scripting/script_manager.h
View file

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

4
engines/zvision/sound/zork_raw.cpp
View file

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

4
engines/zvision/strings/string_manager.cpp
View file

@ -22,9 +22,9 @@
#include "common/scummsys.h" #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/file.h"
#include "common/tokenizer.h" #include "common/tokenizer.h"

2
engines/zvision/strings/string_manager.h
View file

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

2
engines/zvision/utility/clock.cpp
View file

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

2
engines/zvision/utility/lzss_read_stream.cpp
View file

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

2
engines/zvision/utility/single_value_container.cpp
View file

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

4
engines/zvision/utility/utility.cpp
View file

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

4
engines/zvision/video/video.cpp
View file

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

4
engines/zvision/video/zork_avi_decoder.cpp
View file

@ -23,9 +23,9 @@
#include "common/scummsys.h" #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" #include "common/stream.h"

14
engines/zvision/zvision.cpp
View file

@ -24,13 +24,13 @@
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/console.h" #include "zvision/core/console.h"
#include "zvision/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/cursor_manager.h" #include "zvision/cursors/cursor_manager.h"
#include "zvision/save_manager.h" #include "zvision/core/save_manager.h"
#include "zvision/string_manager.h" #include "zvision/strings/string_manager.h"
#include "zvision/zfs_archive.h" #include "zvision/archives/zfs_archive.h"
#include "zvision/detection.h" #include "zvision/detection.h"
#include "common/config-manager.h" #include "common/config-manager.h"

2
engines/zvision/zvision.h
View file

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