games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-19 21:10:12 +02:00
Code Issues Releases Activity

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

Browse Source 
use TTF_Font from SDL_ttf directly
This commit is contained in:
Ivan Savenko 2025-01-09 12:58:34 +02:00 committed by GitHub
commit 662e0f8541
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/renderSDL/CTrueTypeFont.cpp
View File

@ -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();

4
client/renderSDL/CTrueTypeFont.h
View File

@ -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;