ZVISION: Move all of the text related code together

engines/zvision/graphics/render_manager.h

@@ -24,7 +24,7 @@
 #define ZVISION_RENDER_MANAGER_H
 
 #include "zvision/graphics/render_table.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 #include "common/rect.h"
 #include "common/hashmap.h"

engines/zvision/module.mk

@@ -17,8 +17,6 @@ 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 \
 	scripting/controls/fist_control.o \
@@ -44,7 +42,9 @@ MODULE_OBJS := \
 	sound/midi.o \
 	sound/zork_raw.o \
 	text/string_manager.o \
+	text/subtitles.o \
 	text/text.o \
+	text/truetype_font.o \
 	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \

engines/zvision/scripting/sidefx/music_node.h

@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/scripting/sidefx.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 
 namespace Common {
 class String;

engines/zvision/scripting/sidefx/syncsound_node.h

@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/scripting/sidefx.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 
 namespace Common {
 class String;

engines/zvision/scripting/sidefx/ttytext_node.h

@@ -28,7 +28,7 @@
 
 #include "zvision/scripting/sidefx.h"
 #include "zvision/text/text.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 namespace Common {
 class String;

engines/zvision/text/string_manager.h

@@ -24,7 +24,7 @@
 #define ZVISION_STRING_MANAGER_H
 
 #include "zvision/detection.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 namespace Graphics {
 class FontManager;

engines/zvision/text/subtitles.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 #include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
 

engines/zvision/text/text.cpp

@@ -33,7 +33,7 @@
 
 #include "zvision/text/text.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 #include "zvision/scripting/script_manager.h"
 
 namespace ZVision {

engines/zvision/text/text.h

@@ -25,7 +25,7 @@
 #define ZVISION_TEXT_H
 
 #include "zvision/detection.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 #include "zvision/zvision.h"
 
 namespace ZVision {

engines/zvision/text/truetype_font.cpp

@@ -32,7 +32,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 namespace ZVision {
 

engines/zvision/video/video.cpp

@@ -29,7 +29,7 @@
 #include "zvision/zvision.h"
 #include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
 

engines/zvision/zvision.cpp

@@ -33,7 +33,7 @@
 #include "zvision/core/menu.h"
 #include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 #include "zvision/sound/midi.h"
 #include "zvision/file/zfs_archive.h"