ZVISION: Move the subtitle class

scummvm · Dec 3, 2014 · dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624 · dab4ce1
1 parent f0ce0b4
commit dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624
diff --git a/engines/zvision/subtitles/subtitles.cpp → engines/zvision/graphics/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp → 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 → engines/zvision/graphics/subtitles.h b/engines/zvision/subtitles/subtitles.h → engines/zvision/graphics/subtitles.h
diff --git 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
@@ -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
@@ -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
@@ -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 {