diff options
| author | Filippos Karapetis | 2014-12-03 02:38:06 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-03 02:38:06 +0200 |
| commit | dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624 (patch) | |
| tree | def6126454d4ce6af04da8ab9a7f2a7338245ce6 | |
| parent | f0ce0b498fe62fa97428ebcd36caa2ae883eb775 (diff) | |
| download | scummvm-rg350-dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624.tar.gz scummvm-rg350-dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624.tar.bz2 scummvm-rg350-dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624.zip | |
ZVISION: Move the subtitle class
| -rw-r--r-- | engines/zvision/graphics/subtitles.cpp (renamed from engines/zvision/subtitles/subtitles.cpp) | 2 | ||||
| -rw-r--r-- | engines/zvision/graphics/subtitles.h (renamed from engines/zvision/subtitles/subtitles.h) | 0 | ||||
| -rw-r--r-- | engines/zvision/module.mk | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/sidefx/music_node.h | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/sidefx/syncsound_node.h | 2 | ||||
| -rw-r--r-- | engines/zvision/video/video.cpp | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/graphics/subtitles.cpp index d36eb24923..784721562a 100644 --- a/engines/zvision/subtitles/subtitles.cpp +++ b/engines/zvision/graphics/subtitles.cpp @@ -20,8 +20,8 @@ * */ -#include "zvision/subtitles/subtitles.h" #include "zvision/graphics/render_manager.h" +#include "zvision/graphics/subtitles.h" #include "zvision/core/search_manager.h" #include "zvision/text/text.h" diff --git a/engines/zvision/subtitles/subtitles.h b/engines/zvision/graphics/subtitles.h index c3da6583a4..c3da6583a4 100644 --- a/engines/zvision/subtitles/subtitles.h +++ b/engines/zvision/graphics/subtitles.h diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index e2beeb593d..045eb5264a 100644 --- a/engines/zvision/module.mk +++ b/engines/zvision/module.mk @@ -17,6 +17,7 @@ MODULE_OBJS := \ graphics/effects/wave.o \ graphics/render_manager.o \ graphics/render_table.o \ + graphics/subtitles.o \ graphics/truetype_font.o \ scripting/actions.o \ scripting/control.o \ @@ -41,7 +42,6 @@ MODULE_OBJS := \ 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 \ diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h index 954e2f474e..c89345f0d0 100644 --- a/engines/zvision/scripting/sidefx/music_node.h +++ b/engines/zvision/scripting/sidefx/music_node.h @@ -25,7 +25,7 @@ #include "audio/mixer.h" #include "zvision/scripting/sidefx.h" -#include "zvision/subtitles/subtitles.h" +#include "zvision/graphics/subtitles.h" namespace Common { class String; diff --git a/engines/zvision/scripting/sidefx/syncsound_node.h b/engines/zvision/scripting/sidefx/syncsound_node.h index c16ffebe7f..7cd02a8aef 100644 --- a/engines/zvision/scripting/sidefx/syncsound_node.h +++ b/engines/zvision/scripting/sidefx/syncsound_node.h @@ -25,7 +25,7 @@ #include "audio/mixer.h" #include "zvision/scripting/sidefx.h" -#include "zvision/subtitles/subtitles.h" +#include "zvision/graphics/subtitles.h" namespace Common { class String; diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp index 25125ec2fb..36b5f9b921 100644 --- a/engines/zvision/video/video.cpp +++ b/engines/zvision/video/video.cpp @@ -29,7 +29,7 @@ #include "zvision/zvision.h" #include "zvision/utility/clock.h" #include "zvision/graphics/render_manager.h" -#include "zvision/subtitles/subtitles.h" +#include "zvision/graphics/subtitles.h" namespace ZVision { |