From fd09071c29452bdfea2c519f0defbffebee42f4c Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 22 Sep 2012 14:40:13 +0200 Subject: Data dir paths - changed access to paths in data directory in CApplication - models now load from data directory --- src/graphics/engine/terrain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/graphics/engine/terrain.cpp') diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp index 05b7a2d..427e7f6 100644 --- a/src/graphics/engine/terrain.cpp +++ b/src/graphics/engine/terrain.cpp @@ -197,7 +197,7 @@ void CTerrain::AddMaterial(int id, const std::string& texName, const Math::Point bool CTerrain::LoadResources(const std::string& fileName) { CImage img; - if (! img.Load(CApplication::GetInstance().GetDataFilePath(m_engine->GetTextureDir(), fileName))) + if (! img.Load(CApplication::GetInstance().GetDataFilePath(DIR_TEXTURE, fileName))) return false; ImageData *data = img.GetData(); @@ -268,7 +268,7 @@ bool CTerrain::LoadRelief(const std::string &fileName, float scaleRelief, m_scaleRelief = scaleRelief; CImage img; - if (! img.Load(CApplication::GetInstance().GetDataFilePath(m_engine->GetTextureDir(), fileName))) + if (! img.Load(CApplication::GetInstance().GetDataFilePath(DIR_TEXTURE, fileName))) return false; ImageData *data = img.GetData(); -- cgit v1.2.3-1-g7c22