libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Allow compile without freetype

Browse Source
This commit is contained in:
Pawel Kolodziejski 2020-10-07 21:11:04 +02:00
parent 17b9f6f4a7
commit 527ac8ee87
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/grim/font.cpp
View File

@ -164,9 +164,11 @@ void Font::restoreState(SaveGame *state) {
}
void FontTTF::loadTTF(const Common::String &filename, Common::SeekableReadStream *data, int size) {
#ifdef USE_FREETYPE2
_font = Graphics::loadTTFFont(*data, size);
//f->
#else
_font = nullptr;
#endif
}
// Hardcoded default font for FPS, GUI, etc

5
engines/grim/gfx_opengl.cpp
View File

@ -1435,6 +1435,7 @@ void GfxOpenGL::createTextObject(TextObject *text) {
if (g_grim->getGameType() != GType_GRIM || !(g_grim->getGameFlags() & ADGF_REMASTERED))
return;
#ifdef USE_FREETYPE2
//error("Could not get font userdata");
const Font *font = text->getFont();
const FontTTF *f = static_cast<const FontTTF *>(font);
@ -1466,6 +1467,7 @@ void GfxOpenGL::createTextObject(TextObject *text) {
ud->_texids = texids;
text->setUserData(ud);
#endif
}
void GfxOpenGL::drawTextObject(const TextObject *text) {
@ -1495,7 +1497,7 @@ void GfxOpenGL::drawTextObject(const TextObject *text) {
if (!userData) {
if (g_grim->getGameType() != GType_GRIM || !(g_grim->getGameFlags() & ADGF_REMASTERED))
error("Could not get font userdata");
#ifdef USE_FREETYPE2
const FontTTF *f = static_cast<const FontTTF *>(font);
Graphics::Font *gf = f->_font;
@ -1546,6 +1548,7 @@ void GfxOpenGL::drawTextObject(const TextObject *text) {
glEnable(GL_DEPTH_TEST);
glEnable(GL_LIGHTING);
glDepthMask(GL_TRUE);
#endif
return;
}