diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 14:40:13 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 14:40:13 +0200 |
| commit | fd09071c29452bdfea2c519f0defbffebee42f4c (patch) | |
| tree | 44d2d9d59d4c98204cb1d60bf101414bfc45b708 /src/graphics/engine/terrain.cpp | |
| parent | 37e7c73f439c0d8cbfd0f1c02b7ef5916fd748ae (diff) | |
| download | colobot-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/terrain.cpp')
| -rw-r--r-- | src/graphics/engine/terrain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |