浏览代码

Merge pull request #5222 from kambala-decapitator/use-sdl_ttf-type

use TTF_Font from SDL_ttf directly
Ivan Savenko 9 月之前
父节点
当前提交
662e0f8541
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 0 2
      client/renderSDL/CTrueTypeFont.cpp
  2. 2 2
      client/renderSDL/CTrueTypeFont.h

+ 0 - 2
client/renderSDL/CTrueTypeFont.cpp

@@ -20,8 +20,6 @@
 #include "../../lib/filesystem/Filesystem.h"
 #include "../../lib/filesystem/Filesystem.h"
 #include "../../lib/texts/TextOperations.h"
 #include "../../lib/texts/TextOperations.h"
 
 
-#include <SDL_ttf.h>
-
 std::pair<std::unique_ptr<ui8[]>, ui64> CTrueTypeFont::loadData(const JsonNode & config)
 std::pair<std::unique_ptr<ui8[]>, ui64> CTrueTypeFont::loadData(const JsonNode & config)
 {
 {
 	std::string filename = "Data/" + config["file"].String();
 	std::string filename = "Data/" + config["file"].String();

+ 2 - 2
client/renderSDL/CTrueTypeFont.h

@@ -11,14 +11,14 @@
 
 
 #include "../render/IFont.h"
 #include "../render/IFont.h"
 
 
+#include <SDL_ttf.h>
+
 VCMI_LIB_NAMESPACE_BEGIN
 VCMI_LIB_NAMESPACE_BEGIN
 class JsonNode;
 class JsonNode;
 VCMI_LIB_NAMESPACE_END
 VCMI_LIB_NAMESPACE_END
 
 
 class CBitmapFont;
 class CBitmapFont;
 
 
-using TTF_Font = struct _TTF_Font;
-
 class CTrueTypeFont final : public IFont
 class CTrueTypeFont final : public IFont
 {
 {
 	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
 	const std::pair<std::unique_ptr<ui8[]>, ui64> data;