summaryrefslogtreecommitdiff
path: root/GroundMaterialConfiguration.cpp
diff options
context:
space:
mode:
authorKris Parker2009-12-13 04:23:39 +0000
committerKris Parker2009-12-13 04:23:39 +0000
commitaffa9bb79b43be94ce09e28c010f8fd25c245954 (patch)
treebe84976f085b0412cb729ab79ab5561061fb18bb /GroundMaterialConfiguration.cpp
parenta7fa8cd1197ff8fb28cc63d1f85389dd8f62b987 (diff)
downloadstonesense-affa9bb79b43be94ce09e28c010f8fd25c245954.tar.gz
stonesense-affa9bb79b43be94ce09e28c010f8fd25c245954.tar.bz2
stonesense-affa9bb79b43be94ce09e28c010f8fd25c245954.tar.xz
xml and index files are read based on a central master index
content is read relative to the calling file
Diffstat (limited to 'GroundMaterialConfiguration.cpp')
-rw-r--r--GroundMaterialConfiguration.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/GroundMaterialConfiguration.cpp b/GroundMaterialConfiguration.cpp
index e80a3be..f5b2e9e 100644
--- a/GroundMaterialConfiguration.cpp
+++ b/GroundMaterialConfiguration.cpp
@@ -61,7 +61,7 @@ void parseWallFloorSpriteElement( TiXmlElement* elemWallFloorSprite, vector<Terr
const char* filename = elemWallFloorSprite->Attribute("file");
if (filename != NULL && filename[0] != 0)
{
- sprite.fileIndex = loadImgFile((char*)filename);
+ sprite.fileIndex = loadConfigImgFile((char*)filename,elemWallFloorSprite);
}
vector<int> lookupKeys;
@@ -197,7 +197,7 @@ bool addSingleTerrainConfig( TiXmlElement* elemRoot){
const char* filename = elemRoot->Attribute("file");
if (filename != NULL && filename[0] != 0)
{
- basefile = loadImgFile((char*)filename);
+ basefile = loadConfigImgFile((char*)filename,elemRoot);
}
string elementType = elemRoot->Value();