ZVISION: Move the TruetypeFont class

scummvm · Dec 3, 2014 · f0ce0b498fe62fa97428ebcd36caa2ae883eb775 · f0ce0b4
1 parent f2eee17
commit f0ce0b498fe62fa97428ebcd36caa2ae883eb775
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_RENDER_MANAGER_H
 
 #include "zvision/graphics/render_table.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 #include "common/rect.h"
 #include "common/hashmap.h"

diff --git a/engines/zvision/fonts/truetype_font.cpp → engines/zvision/graphics/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp → engines/zvision/graphics/truetype_font.cpp
@@ -21,22 +21,19 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/fonts/truetype_font.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/unzip.h"
-
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 #include "graphics/surface.h"
 
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/truetype_font.h"
+
 namespace ZVision {
 
 TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)

diff --git a/engines/zvision/fonts/truetype_font.h → engines/zvision/graphics/truetype_font.h b/engines/zvision/fonts/truetype_font.h → engines/zvision/graphics/truetype_font.h
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
@@ -12,12 +12,12 @@ MODULE_OBJS := \
 	cursors/cursor_manager.o \
 	cursors/cursor.o \
 	detection.o \
-	fonts/truetype_font.o \
 	graphics/effects/fog.o \
 	graphics/effects/light.o \
 	graphics/effects/wave.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
+	graphics/truetype_font.o \
 	scripting/actions.o \
 	scripting/control.o \
 	scripting/controls/fist_control.o \

diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
@@ -28,7 +28,7 @@
 
 #include "zvision/scripting/sidefx.h"
 #include "zvision/text/text.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 namespace Common {
 class String;

diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
@@ -21,20 +21,17 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/zvision.h"
-#include "zvision/core/search_manager.h"
-#include "zvision/text/string_manager.h"
-
-#include "zvision/fonts/truetype_font.h"
-
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
-
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 
+#include "zvision/zvision.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/string_manager.h"
+#include "zvision/graphics/truetype_font.h"
+
 namespace ZVision {
 
 StringManager::StringManager(ZVision *engine)

diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_STRING_MANAGER_H
 
 #include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 namespace Graphics {
 class FontManager;

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
@@ -21,23 +21,19 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/text/text.h"
-
-#include "zvision/fonts/truetype_font.h"
-
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
 #include "common/rect.h"
-
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 
+#include "zvision/text/text.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/scripting/script_manager.h"
 
 namespace ZVision {

diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
@@ -25,7 +25,7 @@
 #define ZVISION_TEXT_H
 
 #include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/zvision.h"
 
 namespace Graphics {

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
@@ -33,7 +33,7 @@
 #include "zvision/core/menu.h"
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/core/midi.h"
 #include "zvision/utility/zfs_archive.h"