diff options
42 files changed, 166 insertions, 166 deletions
diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp index 5784df0dac..2bb0271966 100644 --- a/engines/zvision/animation/rlf_animation.cpp +++ b/engines/zvision/animation/rlf_animation.cpp @@ -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" diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp index 365ff747f4..49ef22bb51 100644 --- a/engines/zvision/animation_node.cpp +++ b/engines/zvision/animation_node.cpp @@ -25,8 +25,8 @@ #include "zvision/animation_node.h" #include "zvision/zvision.h" -#include "zvision/render_manager.h" -#include "zvision/script_manager.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/scripting/script_manager.h" #include "zvision/meta_animation.h" #include "graphics/surface.h" diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp index 252a4b75ef..ef088f7553 100644 --- a/engines/zvision/core/console.cpp +++ b/engines/zvision/core/console.cpp @@ -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" @@ -45,18 +45,18 @@ namespace ZVision { Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) { - DCmd_Register("loadimage", WRAP_METHOD(Console, cmdLoadImage)); - DCmd_Register("loadvideo", WRAP_METHOD(Console, cmdLoadVideo)); - DCmd_Register("loadsound", WRAP_METHOD(Console, cmdLoadSound)); - DCmd_Register("raw2wav", WRAP_METHOD(Console, cmdRawToWav)); - DCmd_Register("setrenderstate", WRAP_METHOD(Console, cmdSetRenderState)); - DCmd_Register("generaterendertable", WRAP_METHOD(Console, cmdGenerateRenderTable)); - DCmd_Register("setpanoramafov", WRAP_METHOD(Console, cmdSetPanoramaFoV)); - DCmd_Register("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale)); - DCmd_Register("changelocation", WRAP_METHOD(Console, cmdChangeLocation)); - DCmd_Register("dumpfile", WRAP_METHOD(Console, cmdDumpFile)); - DCmd_Register("parseallscrfiles", WRAP_METHOD(Console, cmdParseAllScrFiles)); - DCmd_Register("rendertext", WRAP_METHOD(Console, cmdRenderText)); + registerCmd("loadimage", WRAP_METHOD(Console, cmdLoadImage)); + registerCmd("loadvideo", WRAP_METHOD(Console, cmdLoadVideo)); + registerCmd("loadsound", WRAP_METHOD(Console, cmdLoadSound)); + registerCmd("raw2wav", WRAP_METHOD(Console, cmdRawToWav)); + registerCmd("setrenderstate", WRAP_METHOD(Console, cmdSetRenderState)); + registerCmd("generaterendertable", WRAP_METHOD(Console, cmdGenerateRenderTable)); + registerCmd("setpanoramafov", WRAP_METHOD(Console, cmdSetPanoramaFoV)); + registerCmd("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale)); + registerCmd("changelocation", WRAP_METHOD(Console, cmdChangeLocation)); + registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile)); + registerCmd("parseallscrfiles", WRAP_METHOD(Console, cmdParseAllScrFiles)); + registerCmd("rendertext", WRAP_METHOD(Console, cmdRenderText)); } bool Console::cmdLoadImage(int argc, const char **argv) { @@ -72,7 +72,7 @@ bool Console::cmdLoadImage(int argc, const char **argv) { bool Console::cmdLoadVideo(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Use loadvideo <fileName> to load a video to the screen\n"); + debugPrintf("Use loadvideo <fileName> to load a video to the screen\n"); return true; } @@ -86,7 +86,7 @@ bool Console::cmdLoadVideo(int argc, const char **argv) { bool Console::cmdLoadSound(int argc, const char **argv) { if (!Common::File::exists(argv[1])) { - DebugPrintf("File does not exist\n"); + debugPrintf("File does not exist\n"); return true; } @@ -105,7 +105,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) { Audio::SoundHandle handle; _engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, soundStream, -1, 100, 0, DisposeAfterUse::YES, false, false); } else { - DebugPrintf("Use loadsound <fileName> [<rate> <isStereo: 1 or 0>] to load a sound\n"); + debugPrintf("Use loadsound <fileName> [<rate> <isStereo: 1 or 0>] to load a sound\n"); return true; } @@ -114,7 +114,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) { bool Console::cmdRawToWav(int argc, const char **argv) { if (argc != 3) { - DebugPrintf("Use raw2wav <rawFilePath> <wavFileName> to dump a .RAW file to .WAV\n"); + debugPrintf("Use raw2wav <rawFilePath> <wavFileName> to dump a .RAW file to .WAV\n"); return true; } @@ -124,7 +124,7 @@ bool Console::cmdRawToWav(int argc, const char **argv) { bool Console::cmdSetRenderState(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n"); + debugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n"); return true; } @@ -137,7 +137,7 @@ bool Console::cmdSetRenderState(int argc, const char **argv) { else if (renderState.matchString("flat", true)) _engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::FLAT); else - DebugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n"); + debugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n"); return true; } @@ -150,7 +150,7 @@ bool Console::cmdGenerateRenderTable(int argc, const char **argv) { bool Console::cmdSetPanoramaFoV(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Use setpanoramafov <fieldOfView> to change the current panorama field of view\n"); + debugPrintf("Use setpanoramafov <fieldOfView> to change the current panorama field of view\n"); return true; } @@ -161,7 +161,7 @@ bool Console::cmdSetPanoramaFoV(int argc, const char **argv) { bool Console::cmdSetPanoramaScale(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Use setpanoramascale <scale> to change the current panorama scale\n"); + debugPrintf("Use setpanoramascale <scale> to change the current panorama scale\n"); return true; } @@ -172,7 +172,7 @@ bool Console::cmdSetPanoramaScale(int argc, const char **argv) { bool Console::cmdChangeLocation(int argc, const char **argv) { if (argc != 6) { - DebugPrintf("Use changelocation <char: world> <char: room> <char:node> <char:view> <int: x position> to change your location\n"); + debugPrintf("Use changelocation <char: world> <char: room> <char:node> <char:view> <int: x position> to change your location\n"); return true; } @@ -183,7 +183,7 @@ bool Console::cmdChangeLocation(int argc, const char **argv) { bool Console::cmdDumpFile(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Use dumpfile <fileName> to dump a file\n"); + debugPrintf("Use dumpfile <fileName> to dump a file\n"); return true; } @@ -204,7 +204,7 @@ bool Console::cmdParseAllScrFiles(int argc, const char **argv) { bool Console::cmdRenderText(int argc, const char **argv) { if (argc != 7) { - DebugPrintf("Use rendertext <text> <fontNumber> <destX> <destY> <maxWidth> <1 or 0: wrap> to render text\n"); + debugPrintf("Use rendertext <text> <fontNumber> <destX> <destY> <maxWidth> <1 or 0: wrap> to render text\n"); return true; } diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp index 189bf007c1..943f8ff279 100644 --- a/engines/zvision/core/events.cpp +++ b/engines/zvision/core/events.cpp @@ -24,12 +24,12 @@ #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/menu.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 "zvision/core/menu.h" #include "common/events.h" #include "common/system.h" diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h index 7be03f62ef..cc802ee5f5 100644 --- a/engines/zvision/core/menu.h +++ b/engines/zvision/core/menu.h @@ -27,7 +27,7 @@ #include "common/rect.h" #include "zvision/zvision.h" -#include "zvision/script_manager.h" +#include "zvision/scripting/script_manager.h" namespace ZVision { diff --git a/engines/zvision/cursors/cursor.cpp b/engines/zvision/cursors/cursor.cpp index e2e3d7ee72..8c6027a1bb 100644 --- a/engines/zvision/cursors/cursor.cpp +++ b/engines/zvision/cursors/cursor.cpp @@ -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" diff --git a/engines/zvision/cursors/cursor_manager.cpp b/engines/zvision/cursors/cursor_manager.cpp index c66fa650a8..cfb4baf636 100644 --- a/engines/zvision/cursors/cursor_manager.cpp +++ b/engines/zvision/cursors/cursor_manager.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#include "zvision/cursor_manager.h" +#include "zvision/cursors/cursor_manager.h" #include "zvision/zvision.h" diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h index 0521a17337..5392fd5e03 100644 --- a/engines/zvision/cursors/cursor_manager.h +++ b/engines/zvision/cursors/cursor_manager.h @@ -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" diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp index e3eea403b6..224603c469 100644 --- a/engines/zvision/fonts/truetype_font.cpp +++ b/engines/zvision/fonts/truetype_font.cpp @@ -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/config-manager.h" #include "common/debug.h" @@ -212,7 +212,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) { if (themeArchive->hasFile("FreeSans.ttf")) { Common::SeekableReadStream *stream = nullptr; stream = themeArchive->createReadStreamForMember("FreeSans.ttf"); - Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, sharp); // 66 dpi for 640 x 480 on 14" display + Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display if (_newFont) { if (!_font) delete _font; @@ -225,7 +225,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) { themeArchive = nullptr; } } else { - Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, sharp); // 66 dpi for 640 x 480 on 14" display + Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display if (_newFont) { if (!_font) delete _font; diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h index bed1d5513e..0fed3ccbc4 100644 --- a/engines/zvision/fonts/truetype_font.h +++ b/engines/zvision/fonts/truetype_font.h @@ -43,12 +43,12 @@ public: ~TruetypeFont(); private: -// ZVision *_engine; + ZVision *_engine; Graphics::Font *_font; int _lineHeight; -// size_t _maxCharWidth; -// size_t _maxCharHeight; + size_t _maxCharWidth; + size_t _maxCharHeight; public: int32 _fontHeight; diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp index 071affffab..c9dc5d37b2 100644 --- a/engines/zvision/graphics/render_manager.cpp +++ b/engines/zvision/graphics/render_manager.cpp @@ -23,10 +23,10 @@ #include "common/scummsys.h" #include "zvision/zvision.h" -#include "zvision/render_manager.h" +#include "zvision/graphics/render_manager.h" #include "zvision/text.h" -#include "zvision/lzss_read_stream.h" +#include "zvision/utility/lzss_read_stream.h" #include "common/file.h" #include "common/system.h" @@ -34,7 +34,7 @@ #include "engines/util.h" -#include "graphics/decoders/tga.h" +#include "image/tga.h" namespace ZVision { @@ -127,7 +127,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics: uint32 imageWidth; uint32 imageHeight; - Graphics::TGADecoder tga; + Image::TGADecoder tga; uint16 *buffer; bool isTransposed = _renderTable.getRenderState() == RenderTable::PANORAMA; // All ZVision images are in RGB 555 @@ -221,7 +221,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics: uint32 imageWidth; uint32 imageHeight; - Graphics::TGADecoder tga; + Image::TGADecoder tga; uint16 *buffer; // All ZVision images are in RGB 555 Graphics::PixelFormat pixelFormat555 = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h index 668c8acc41..ca2e715e8a 100644 --- a/engines/zvision/graphics/render_manager.h +++ b/engines/zvision/graphics/render_manager.h @@ -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" diff --git a/engines/zvision/inventory_manager.cpp b/engines/zvision/inventory_manager.cpp index 3924c6b51a..f8b22970c4 100644 --- a/engines/zvision/inventory_manager.cpp +++ b/engines/zvision/inventory_manager.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#include "zvision/script_manager.h" +#include "zvision/scripting/script_manager.h" namespace ZVision { diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp index bf422b300f..bf311c4577 100644 --- a/engines/zvision/menu.cpp +++ b/engines/zvision/menu.cpp @@ -22,9 +22,9 @@ #include "common/scummsys.h" -#include "zvision/menu.h" +#include "zvision/core/menu.h" -#include "zvision/render_manager.h" +#include "zvision/graphics/render_manager.h" namespace ZVision { diff --git a/engines/zvision/meta_animation.cpp b/engines/zvision/meta_animation.cpp index 33ae92a523..dddc238379 100644 --- a/engines/zvision/meta_animation.cpp +++ b/engines/zvision/meta_animation.cpp @@ -25,10 +25,10 @@ #include "zvision/meta_animation.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" diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index d6d0dd7b5a..a386f6fac6 100644 --- a/engines/zvision/module.mk +++ b/engines/zvision/module.mk @@ -1,35 +1,35 @@ MODULE := engines/zvision MODULE_OBJS := \ - actions.o \ + scripting/actions.o \ animation_node.o \ - clock.o \ - console.o \ - control.o \ - cursor.o \ - cursor_manager.o \ + utility/clock.o \ + core/console.o \ + scripting/control.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 \ + core/events.o \ + scripting/controls/input_control.o \ + scripting/controls/lever_control.o \ + utility/lzss_read_stream.o \ + scripting/controls/push_toggle_control.o \ + graphics/render_manager.o \ + graphics/render_table.o \ + animation/rlf_animation.o \ + core/save_manager.o \ + scripting/scr_file_handling.o \ + scripting/script_manager.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 \ - zfs_archive.o \ - zork_avi_decoder.o \ - zork_raw.o \ + archives/zfs_archive.o \ + video/zork_avi_decoder.o \ + sound/zork_raw.o \ sidefx.o \ music_node.o \ inventory_manager.o \ diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp index b716b3ead1..f8fd08b285 100644 --- a/engines/zvision/music_node.cpp +++ b/engines/zvision/music_node.cpp @@ -25,9 +25,9 @@ #include "zvision/music_node.h" #include "zvision/zvision.h" -#include "zvision/script_manager.h" -#include "zvision/render_manager.h" -#include "zvision/zork_raw.h" +#include "zvision/scripting/script_manager.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/sound/zork_raw.h" #include "common/stream.h" #include "common/file.h" diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h index d24496fc02..0dad22614b 100644 --- a/engines/zvision/music_node.h +++ b/engines/zvision/music_node.h @@ -25,7 +25,7 @@ #include "audio/mixer.h" #include "zvision/sidefx.h" -#include "zvision/subtitles.h" +#include "zvision/subtitles/subtitles.h" namespace Common { class String; diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index f60a69744a..3c341fbc80 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -22,14 +22,14 @@ #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/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/music_node.h" #include "zvision/syncsound_node.h" #include "zvision/animation_node.h" diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp index a366e06923..ca707b5ab0 100644 --- a/engines/zvision/scripting/controls/input_control.cpp +++ b/engines/zvision/scripting/controls/input_control.cpp @@ -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" diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp index f68f256229..121fab97e1 100644 --- a/engines/zvision/scripting/controls/lever_control.cpp +++ b/engines/zvision/scripting/controls/lever_control.cpp @@ -22,14 +22,14 @@ #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/scripting/script_manager.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/cursors/cursor_manager.h" #include "zvision/meta_animation.h" -#include "zvision/utility.h" +#include "zvision/utility/utility.h" #include "common/stream.h" #include "common/file.h" diff --git a/engines/zvision/scripting/controls/timer_node.cpp b/engines/zvision/scripting/controls/timer_node.cpp index a94f6db19b..e68610f537 100644 --- a/engines/zvision/scripting/controls/timer_node.cpp +++ b/engines/zvision/scripting/controls/timer_node.cpp @@ -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" diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h index 4d50756b87..ab38c5fc5d 100644 --- a/engines/zvision/scripting/puzzle.h +++ b/engines/zvision/scripting/puzzle.h @@ -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" diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp index 9d1d0bf856..fff187d369 100644 --- a/engines/zvision/scripting/scr_file_handling.cpp +++ b/engines/zvision/scripting/scr_file_handling.cpp @@ -23,13 +23,13 @@ #include "common/scummsys.h" #include "zvision/zvision.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 "zvision/slot_control.h" #include "common/textconsole.h" diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp index 1a567397a8..9713a34733 100644 --- a/engines/zvision/scripting/script_manager.cpp +++ b/engines/zvision/scripting/script_manager.cpp @@ -22,15 +22,15 @@ #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/timer_node.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 "zvision/scripting/controls/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 6adade5745..a835c13951 100644 --- a/engines/zvision/scripting/script_manager.h +++ b/engines/zvision/scripting/script_manager.h @@ -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 "zvision/sidefx.h" #include "common/hashmap.h" diff --git a/engines/zvision/search_manager.cpp b/engines/zvision/search_manager.cpp index 124a49912d..db120f2a4b 100644 --- a/engines/zvision/search_manager.cpp +++ b/engines/zvision/search_manager.cpp @@ -22,7 +22,7 @@ #include "common/debug.h" #include "zvision/search_manager.h" -#include "zvision/zfs_archive.h" +#include "zvision/archives/zfs_archive.h" #include "common/fs.h" #include "common/stream.h" diff --git a/engines/zvision/sidefx.cpp b/engines/zvision/sidefx.cpp index 3874c86485..7ba1959db7 100644 --- a/engines/zvision/sidefx.cpp +++ b/engines/zvision/sidefx.cpp @@ -25,8 +25,8 @@ #include "zvision/sidefx.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" diff --git a/engines/zvision/slot_control.cpp b/engines/zvision/slot_control.cpp index 111a7c63e8..d3d9c2ec4b 100644 --- a/engines/zvision/slot_control.cpp +++ b/engines/zvision/slot_control.cpp @@ -25,10 +25,10 @@ #include "zvision/slot_control.h" #include "zvision/zvision.h" -#include "zvision/script_manager.h" -#include "zvision/cursor_manager.h" -#include "zvision/render_manager.h" -#include "zvision/utility.h" +#include "zvision/scripting/script_manager.h" +#include "zvision/cursors/cursor_manager.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/utility/utility.h" #include "common/stream.h" diff --git a/engines/zvision/slot_control.h b/engines/zvision/slot_control.h index eec2d04518..0ac8ec9ce0 100644 --- a/engines/zvision/slot_control.h +++ b/engines/zvision/slot_control.h @@ -23,7 +23,7 @@ #ifndef ZVISION_SLOT_CONTROL_H #define ZVISION_SLOT_CONTROL_H -#include "zvision/control.h" +#include "zvision/scripting/control.h" #include "graphics/surface.h" diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp index a4d091f3c0..a0f660f65f 100644 --- a/engines/zvision/sound/zork_raw.cpp +++ b/engines/zvision/sound/zork_raw.cpp @@ -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" diff --git a/engines/zvision/subtitles.cpp b/engines/zvision/subtitles.cpp index 1942e3c979..da9b0fc1c9 100644 --- a/engines/zvision/subtitles.cpp +++ b/engines/zvision/subtitles.cpp @@ -20,8 +20,8 @@ * */ -#include "zvision/subtitles.h" -#include "zvision/render_manager.h" +#include "zvision/subtitles/subtitles.h" +#include "zvision/graphics/render_manager.h" #include "zvision/search_manager.h" #include "zvision/text.h" diff --git a/engines/zvision/syncsound_node.cpp b/engines/zvision/syncsound_node.cpp index 5d04c1fb70..7bd520d475 100644 --- a/engines/zvision/syncsound_node.cpp +++ b/engines/zvision/syncsound_node.cpp @@ -25,9 +25,9 @@ #include "zvision/syncsound_node.h" #include "zvision/zvision.h" -#include "zvision/script_manager.h" -#include "zvision/render_manager.h" -#include "zvision/zork_raw.h" +#include "zvision/scripting/script_manager.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/sound/zork_raw.h" #include "common/stream.h" #include "common/file.h" diff --git a/engines/zvision/syncsound_node.h b/engines/zvision/syncsound_node.h index 7d875f2797..1f63ec48dd 100644 --- a/engines/zvision/syncsound_node.h +++ b/engines/zvision/syncsound_node.h @@ -25,7 +25,7 @@ #include "audio/mixer.h" #include "zvision/sidefx.h" -#include "zvision/subtitles.h" +#include "zvision/subtitles/subtitles.h" namespace Common { class String; diff --git a/engines/zvision/text.cpp b/engines/zvision/text.cpp index 2fdfafcdf6..6b0ff0712b 100644 --- a/engines/zvision/text.cpp +++ b/engines/zvision/text.cpp @@ -24,7 +24,7 @@ #include "zvision/text.h" -#include "zvision/truetype_font.h" +#include "zvision/fonts/truetype_font.h" #include "common/file.h" #include "common/tokenizer.h" @@ -37,8 +37,8 @@ #include "graphics/font.h" #include "graphics/fonts/ttf.h" -#include "zvision/render_manager.h" -#include "zvision/script_manager.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/scripting/script_manager.h" namespace ZVision { diff --git a/engines/zvision/text.h b/engines/zvision/text.h index c1dc0c167c..4b318fdef0 100644 --- a/engines/zvision/text.h +++ b/engines/zvision/text.h @@ -25,7 +25,7 @@ #define ZVISION_TEXT_H #include "zvision/detection.h" -#include "zvision/truetype_font.h" +#include "zvision/fonts/truetype_font.h" #include "zvision/zvision.h" diff --git a/engines/zvision/ttytext_node.cpp b/engines/zvision/ttytext_node.cpp index 4f64800cd7..6741d28a56 100644 --- a/engines/zvision/ttytext_node.cpp +++ b/engines/zvision/ttytext_node.cpp @@ -25,8 +25,8 @@ #include "zvision/ttytext_node.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 "zvision/text.h" #include "common/stream.h" diff --git a/engines/zvision/ttytext_node.h b/engines/zvision/ttytext_node.h index 6c3e6f46af..e25fdb0c07 100644 --- a/engines/zvision/ttytext_node.h +++ b/engines/zvision/ttytext_node.h @@ -28,7 +28,7 @@ #include "zvision/sidefx.h" #include "zvision/text.h" -#include "zvision/truetype_font.h" +#include "zvision/fonts/truetype_font.h" namespace Common { class String; diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp index 0ad9000fcb..7a120df76b 100644 --- a/engines/zvision/video/video.cpp +++ b/engines/zvision/video/video.cpp @@ -24,9 +24,9 @@ #include "zvision/zvision.h" -#include "zvision/clock.h" -#include "zvision/render_manager.h" -#include "zvision/subtitles.h" +#include "zvision/utility/clock.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/subtitles/subtitles.h" #include "common/system.h" diff --git a/engines/zvision/video/zork_avi_decoder.h b/engines/zvision/video/zork_avi_decoder.h index d8937ac057..db1ad312c7 100644 --- a/engines/zvision/video/zork_avi_decoder.h +++ b/engines/zvision/video/zork_avi_decoder.h @@ -25,7 +25,7 @@ #define ZORK_AVI_DECODER_H #include "video/avi_decoder.h" -#include "zork_raw.h" +#include "zvision/sound/zork_raw.h" namespace ZVision { diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index b1615aa7b4..580f8c4367 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -24,18 +24,18 @@ #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 "zvision/menu.h" +#include "zvision/core/menu.h" #include "zvision/search_manager.h" #include "zvision/text.h" -#include "zvision/truetype_font.h" +#include "zvision/fonts/truetype_font.h" #include "common/config-manager.h" #include "common/str.h" diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index 982d3fd98b..2674df27e0 100644 --- a/engines/zvision/zvision.h +++ b/engines/zvision/zvision.h @@ -25,7 +25,7 @@ #define ZVISION_ZVISION_H #include "zvision/detection.h" -#include "zvision/clock.h" +#include "zvision/utility/clock.h" #include "zvision/search_manager.h" #include "common/random.h" |