summaryrefslogtreecommitdiff
path: root/GroundMaterialConfiguration.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-08-07 01:35:28 +0000
committerPetr Mrázek2011-08-07 01:35:28 +0000
commit4064cf25797462fc6ac61f578b7e4b6bd31bf6b6 (patch)
tree1a1744e66471edd1948b02bf4627e87693f1685a /GroundMaterialConfiguration.cpp
parentd841ba0fee6e1f98e414c52dd07b44b981bc05fe (diff)
downloadstonesense-4064cf25797462fc6ac61f578b7e4b6bd31bf6b6.tar.gz
stonesense-4064cf25797462fc6ac61f578b7e4b6bd31bf6b6.tar.bz2
stonesense-4064cf25797462fc6ac61f578b7e4b6bd31bf6b6.tar.xz
stonesense now doesn't crash while starting for the second time
Diffstat (limited to 'GroundMaterialConfiguration.cpp')
-rw-r--r--GroundMaterialConfiguration.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/GroundMaterialConfiguration.cpp b/GroundMaterialConfiguration.cpp
index 22396b4..af2258e 100644
--- a/GroundMaterialConfiguration.cpp
+++ b/GroundMaterialConfiguration.cpp
@@ -45,8 +45,8 @@ TerrainConfiguration::~TerrainConfiguration()
void DumpInorganicMaterialNamesToDisk(){
FILE* fp = fopen("dump.txt", "w");
if(!fp) return;
- for(uint32_t j=0; j < contentLoader.inorganic.size(); j++){
- fprintf(fp, "%i:%s\n",j, contentLoader.inorganic[j].id.c_str());
+ for(uint32_t j=0; j < contentLoader->inorganic.size(); j++){
+ fprintf(fp, "%i:%s\n",j, contentLoader->inorganic[j].id.c_str());
}
fclose(fp);
}
@@ -248,7 +248,7 @@ bool addSingleTerrainConfig( TiXmlElement* elemRoot){
//parse floors
TiXmlElement* elemFloor = elemRoot->FirstChildElement("floor");
while( elemFloor ){
- parseWallFloorSpriteElement( elemFloor, contentLoader.terrainFloorConfigs, basefile, true);
+ parseWallFloorSpriteElement( elemFloor, contentLoader->terrainFloorConfigs, basefile, true);
elemFloor = elemFloor->NextSiblingElement("floor");
}
}
@@ -256,7 +256,7 @@ bool addSingleTerrainConfig( TiXmlElement* elemRoot){
//parse walls
TiXmlElement* elemWall = elemRoot->FirstChildElement("block");
while( elemWall ){
- parseWallFloorSpriteElement( elemWall, contentLoader.terrainBlockConfigs, basefile, false);
+ parseWallFloorSpriteElement( elemWall, contentLoader->terrainBlockConfigs, basefile, false);
elemWall = elemWall->NextSiblingElement("block");
}
}