oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

unbreak tiemays breakage 3

This commit is contained in:
darkrose 2014-11-16 05:39:15 +10:00
parent 37882e3de7
commit 3052ceadfb
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmake_config.h.in
View File

@ -6,6 +6,8 @@
#define PROJECT_NAME "@PROJECT_NAME@"
#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
#define VERSION_STRING "@VERSION_STRING@"
#define USE_AUDIO @USE_AUDIO@
#define USE_FREETYPE @USE_FREETYPE@
#define USE_GETTEXT @USE_GETTEXT@
#ifdef NDEBUG
#define BUILD_TYPE "Release"

8
src/main.cpp
View File

@ -76,6 +76,9 @@
#include "path.h"
#include "gui_colours.h"
#include "character_creator.h"
#if USE_FREETYPE
#include "xCGUITTFont.h"
#endif
// This makes textures
ITextureSource *g_texturesource = NULL;
@ -1113,7 +1116,12 @@ int main(int argc, char *argv[])
guienv = device->getGUIEnvironment();
gui::IGUISkin* skin = guienv->getSkin();
#if USE_FREETYPE
u16 font_size = g_settings->getU16("font_size");
gui::IGUIFont* font = gui::CGUITTFont::createTTFont(guienv, getPath("font","liberationsans.ttf",false).c_str(), font_size, true, true, 1, 128);
#else
gui::IGUIFont* font = guienv->getFont(getTexturePath("fontlucida.png").c_str());
#endif
if (font) {
skin->setFont(font);
}else{