From 74cb5bcd686590f9ec1fc409118ca34db7ebd579 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 Sep 2013 23:32:38 +0300 Subject: Fix fonts loading on windows. --- src/gui/sdlfont.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 13749895a..f316b46d6 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -31,6 +31,9 @@ #include "resources/image.h" #include "resources/imagehelper.h" +#ifdef WIN32 +#include "resources/resourcemanager.h" +#endif #include "resources/surfaceimagehelper.h" #include "utils/paths.h" @@ -395,11 +398,15 @@ SDLFont::~SDLFont() TTF_Font *SDLFont::openFont(const char *const name, const int size) { - logger->log("font to open: %s", name); +#ifdef WIN32 + return TTF_OpenFontIndex(ResourceManager::getInstance()->getPath( + name).c_str(), size, 0); +#else SDL_RWops *const rw = MPHYSFSRWOPS_openRead(name); if (!rw) return nullptr; return TTF_OpenFontIndexRW(rw, 1, size, 0); +#endif } void SDLFont::loadFont(std::string filename, -- cgit v1.2.3-70-g09d2