ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved fonts to the (duh) /fonts directory in /data

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4524 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-01-24 00:26:41 +00:00
parent a1932cd4e3
commit 05f21d45ee
7 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/gui/LayneHansom.xml → data/fonts/LayneHansom.xml
View File

0
data/gui/LayneHansom0.png → data/fonts/LayneHansom0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

0
data/gui/title_font.png → data/fonts/title_font.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 186 KiB

0
data/gui/title_font.xml → data/fonts/title_font.xml
View File

0
data/gui/title_font_2.png → data/fonts/title_font_2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 157 KiB

3
src/guiengine/CGUIFont.cpp
View File

@ -77,7 +77,8 @@ bool ScalableFont::load(io::IXMLReader* xml)
if (core::stringw(L"Texture") == xml->getNodeName()) if (core::stringw(L"Texture") == xml->getNodeName())
{ {
// add a texture // add a texture
core::stringc fn = core::stringc((file_manager->getGUIDir() + "/").c_str()) + xml->getAttributeValue(L"filename"); core::stringc filename = xml->getAttributeValue(L"filename");
core::stringc fn = file_manager->getFontFile(filename.c_str()).c_str();
u32 i = (u32)xml->getAttributeValueAsInt(L"index"); u32 i = (u32)xml->getAttributeValueAsInt(L"index");
core::stringw alpha = xml->getAttributeValue(L"hasAlpha"); core::stringw alpha = xml->getAttributeValue(L"hasAlpha");

4
src/guiengine/engine.cpp
View File

@ -205,12 +205,12 @@ void init(IrrlichtDevice* device_a, IVideoDriver* driver_a, AbstractStateManager
const float title_text_scale = 0.2f + 0.2f*std::max(0, screen_width - 640)/564.0f; const float title_text_scale = 0.2f + 0.2f*std::max(0, screen_width - 640)/564.0f;
//ScalableFont* sfont = new ScalableFont(g_env, (file_manager->getGUIDir() + "/okolaks.xml").c_str()); //ScalableFont* sfont = new ScalableFont(g_env, (file_manager->getGUIDir() + "/okolaks.xml").c_str());
ScalableFont* sfont = new ScalableFont(g_env, (file_manager->getGUIDir() + "/LayneHansom.xml").c_str()); ScalableFont* sfont = new ScalableFont(g_env, file_manager->getFontFile("LayneHansom.xml").c_str() );
sfont->setScale(normal_text_scale); sfont->setScale(normal_text_scale);
sfont->setKerningHeight(-5); sfont->setKerningHeight(-5);
g_font = sfont; g_font = sfont;
ScalableFont* sfont2 = new ScalableFont(g_env, (file_manager->getGUIDir() + "/title_font.xml").c_str()); ScalableFont* sfont2 = new ScalableFont(g_env, file_manager->getFontFile("title_font.xml").c_str() );
sfont2->setScale(title_text_scale); sfont2->setScale(title_text_scale);
sfont2->setKerningWidth(-18); sfont2->setKerningWidth(-18);
g_title_font = sfont2; g_title_font = sfont2;