mirror of
https://github.com/vcmi/vcmi.git
synced 2025-03-17 20:58:07 +02:00
Merge pull request #5222 from kambala-decapitator/use-sdl_ttf-type
use TTF_Font from SDL_ttf directly
This commit is contained in:
commit
662e0f8541
@ -20,8 +20,6 @@
|
||||
#include "../../lib/filesystem/Filesystem.h"
|
||||
#include "../../lib/texts/TextOperations.h"
|
||||
|
||||
#include <SDL_ttf.h>
|
||||
|
||||
std::pair<std::unique_ptr<ui8[]>, ui64> CTrueTypeFont::loadData(const JsonNode & config)
|
||||
{
|
||||
std::string filename = "Data/" + config["file"].String();
|
||||
|
@ -11,14 +11,14 @@
|
||||
|
||||
#include "../render/IFont.h"
|
||||
|
||||
#include <SDL_ttf.h>
|
||||
|
||||
VCMI_LIB_NAMESPACE_BEGIN
|
||||
class JsonNode;
|
||||
VCMI_LIB_NAMESPACE_END
|
||||
|
||||
class CBitmapFont;
|
||||
|
||||
using TTF_Font = struct _TTF_Font;
|
||||
|
||||
class CTrueTypeFont final : public IFont
|
||||
{
|
||||
const std::pair<std::unique_ptr<ui8[]>, ui64> data;
|
||||
|
Loading…
x
Reference in New Issue
Block a user