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

ZVISION: Move all the remaining utility classes into the core

Browse source
This commit is contained in:
Filippos Karapetis 2014-12-16 01:21:57 +02:00
parent d8a961244d
commit 7630e3204e
22 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

0
engines/zvision/utility/clock.h → engines/zvision/core/clock.h
View file

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

@ -30,7 +30,7 @@
#include "zvision/text/string_manager.h" #include "zvision/text/string_manager.h"
#include "zvision/video/zork_avi_decoder.h" #include "zvision/video/zork_avi_decoder.h"
#include "zvision/sound/zork_raw.h" #include "zvision/sound/zork_raw.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "zvision/graphics/cursors/cursor.h" #include "zvision/graphics/cursors/cursor.h"
#include "common/system.h" #include "common/system.h"

2
engines/zvision/utility/utility.cpp → engines/zvision/core/utility.cpp
View file

@ -22,7 +22,7 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/sound/zork_raw.h" #include "zvision/sound/zork_raw.h"

0
engines/zvision/utility/utility.h → engines/zvision/core/utility.h
View file

4
engines/zvision/module.mk
View file

@ -2,9 +2,11 @@ MODULE := engines/zvision
MODULE_OBJS := \ MODULE_OBJS := \
core/console.o \ core/console.o \
core/clock.o \
core/events.o \ core/events.o \
core/menu.o \ core/menu.o \
core/save_manager.o \ core/save_manager.o \
core/utility.o \
detection.o \ detection.o \
file/lzss_read_stream.o \ file/lzss_read_stream.o \
file/search_manager.o \ file/search_manager.o \
@ -44,8 +46,6 @@ MODULE_OBJS := \
sound/zork_raw.o \ sound/zork_raw.o \
text/string_manager.o \ text/string_manager.o \
text/text.o \ text/text.o \
utility/clock.o \
utility/utility.o \
video/rlf_decoder.o \ video/rlf_decoder.o \
video/video.o \ video/video.o \
video/zork_avi_decoder.o \ video/zork_avi_decoder.o \

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

@ -27,7 +27,7 @@
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "common/stream.h" #include "common/stream.h"

2
engines/zvision/scripting/controls/fist_control.cpp
View file

@ -27,7 +27,7 @@
#include "zvision/scripting/controls/fist_control.h" #include "zvision/scripting/controls/fist_control.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/graphics/cursors/cursor_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 "zvision/video/rlf_decoder.h"
#include "common/stream.h" #include "common/stream.h"

2
engines/zvision/scripting/controls/hotmov_control.cpp
View file

@ -28,7 +28,7 @@
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/graphics/cursors/cursor_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/stream.h"
#include "common/file.h" #include "common/file.h"

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

@ -29,7 +29,7 @@
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/text/string_manager.h" #include "zvision/text/string_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "common/str.h" #include "common/str.h"
#include "common/stream.h" #include "common/stream.h"

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

@ -28,7 +28,7 @@
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/graphics/cursors/cursor_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/stream.h"
#include "common/file.h" #include "common/file.h"

2
engines/zvision/scripting/controls/paint_control.cpp
View file

@ -28,7 +28,7 @@
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/cursors/cursor_manager.h" #include "zvision/graphics/cursors/cursor_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
namespace ZVision { namespace ZVision {

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

@ -27,7 +27,7 @@
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/cursors/cursor_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/stream.h"

2
engines/zvision/scripting/controls/safe_control.cpp
View file

@ -28,7 +28,7 @@
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/graphics/cursors/cursor_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/stream.h"
#include "common/file.h" #include "common/file.h"

2
engines/zvision/scripting/controls/save_control.cpp
View file

@ -24,7 +24,7 @@
#include "zvision/scripting/controls/input_control.h" #include "zvision/scripting/controls/input_control.h"
#include "zvision/scripting/controls/save_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/zvision.h"
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"

2
engines/zvision/scripting/controls/slot_control.cpp
View file

@ -28,7 +28,7 @@
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/cursors/cursor_manager.h" #include "zvision/graphics/cursors/cursor_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "common/stream.h" #include "common/stream.h"

2
engines/zvision/scripting/controls/titler_control.cpp
View file

@ -28,7 +28,7 @@
#include "zvision/text/text.h" #include "zvision/text/text.h"
#include "zvision/scripting/script_manager.h" #include "zvision/scripting/script_manager.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "common/stream.h" #include "common/stream.h"

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

@ -25,7 +25,7 @@
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/scripting/script_manager.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/puzzle.h"
#include "zvision/scripting/actions.h" #include "zvision/scripting/actions.h"
#include "zvision/scripting/controls/push_toggle_control.h" #include "zvision/scripting/controls/push_toggle_control.h"

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

@ -29,7 +29,7 @@
#include "zvision/graphics/cursors/cursor_manager.h" #include "zvision/graphics/cursors/cursor_manager.h"
#include "zvision/core/save_manager.h" #include "zvision/core/save_manager.h"
#include "zvision/scripting/actions.h" #include "zvision/scripting/actions.h"
#include "zvision/utility/utility.h" #include "zvision/core/utility.h"
#include "zvision/scripting/sidefx/timer_node.h" #include "zvision/scripting/sidefx/timer_node.h"
#include "common/algorithm.h" #include "common/algorithm.h"

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

@ -34,7 +34,7 @@
#include "zvision/sound/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/utility.h" #include "zvision/core/utility.h"
namespace ZVision { namespace ZVision {

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

@ -27,7 +27,7 @@
#include "graphics/surface.h" #include "graphics/surface.h"
#include "zvision/zvision.h" #include "zvision/zvision.h"
#include "zvision/utility/clock.h" #include "zvision/core/clock.h"
#include "zvision/graphics/render_manager.h" #include "zvision/graphics/render_manager.h"
#include "zvision/graphics/subtitles.h" #include "zvision/graphics/subtitles.h"
#include "zvision/video/rlf_decoder.h" #include "zvision/video/rlf_decoder.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/utility/clock.h" #include "zvision/core/clock.h"
#include "zvision/file/search_manager.h" #include "zvision/file/search_manager.h"
#include "common/random.h" #include "common/random.h"