summaryrefslogtreecommitdiffstats
path: root/src/graphics/engine/text.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-22 14:40:13 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-22 14:40:13 +0200
commitfd09071c29452bdfea2c519f0defbffebee42f4c (patch)
tree44d2d9d59d4c98204cb1d60bf101414bfc45b708 /src/graphics/engine/text.cpp
parent37e7c73f439c0d8cbfd0f1c02b7ef5916fd748ae (diff)
downloadcolobot-fd09071c29452bdfea2c519f0defbffebee42f4c.tar.gz
colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.tar.bz2
colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.zip
Data dir paths
- changed access to paths in data directory in CApplication - models now load from data directory
Diffstat (limited to 'src/graphics/engine/text.cpp')
-rw-r--r--src/graphics/engine/text.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp
index 7e226a0..36ad660 100644
--- a/src/graphics/engine/text.cpp
+++ b/src/graphics/engine/text.cpp
@@ -58,7 +58,6 @@ CText::CText(CInstanceManager *iMan, CEngine* engine)
m_engine = engine;
m_defaultSize = 12.0f;
- m_fontPath = "fonts";
m_lastFontType = FONT_COLOBOT;
m_lastFontSize = 0;
@@ -738,7 +737,7 @@ CachedFont* CText::GetOrOpenFont(FontType font, float size)
return m_lastCachedFont;
}
- std::string path = CApplication::GetInstance().GetDataFilePath(m_fontPath, mf->fileName);
+ std::string path = CApplication::GetInstance().GetDataFilePath(DIR_FONT, mf->fileName);
m_lastCachedFont = new CachedFont();
m_lastCachedFont->font = TTF_OpenFont(path.c_str(), pointSize);