summaryrefslogtreecommitdiff
path: root/ContentLoader.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-08-07 04:28:51 +0000
committerPetr Mrázek2011-08-07 04:28:51 +0000
commit9c99824a023a959bb9ff908b2f434e02b8289351 (patch)
tree609ee50e778bae6b2eb10f68bf36e8b96752f3e5 /ContentLoader.cpp
parent4064cf25797462fc6ac61f578b7e4b6bd31bf6b6 (diff)
downloadstonesense-9c99824a023a959bb9ff908b2f434e02b8289351.tar.gz
stonesense-9c99824a023a959bb9ff908b2f434e02b8289351.tar.bz2
stonesense-9c99824a023a959bb9ff908b2f434e02b8289351.tar.xz
Make stonesense use DF/stonesense for all resources.
Diffstat (limited to 'ContentLoader.cpp')
-rw-r--r--ContentLoader.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index 0c5f759..fe0a2d0 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -21,7 +21,7 @@ ContentLoader::~ContentLoader(void)
flushTerrainConfig(terrainFloorConfigs);
flushTerrainConfig(terrainBlockConfigs);
flushCreatureConfig();
- flushColorConfig(colorConfigs);
+ colorConfigs.clear();
}
void DumpMaterialNamesToDisk(vector<t_matgloss> material, const char* filename){
@@ -52,7 +52,7 @@ bool ContentLoader::Load( DFHack::Core& DF){
flushBuildingConfig(&customBuildingConfigs);
flushTerrainConfig(terrainFloorConfigs);
flushTerrainConfig(terrainBlockConfigs);
- flushColorConfig(colorConfigs);
+ colorConfigs.clear();
creatureConfigs.clear();
treeConfigs.clear();
shrubConfigs.clear();
@@ -227,7 +227,9 @@ bool ContentLoader::Load( DFHack::Core& DF){
contentLoader->obsidian = lookupMaterialIndex(INORGANIC, "OBSIDIAN");
loadGraphicsFromDisk(); //these get destroyed when flushImgFiles is called.
- bool overallResult = parseContentIndexFile( "index.txt" );
+ ALLEGRO_PATH * p = al_create_path("stonesense/index.txt");
+ bool overallResult = parseContentIndexFile( al_path_cstr(p, ALLEGRO_NATIVE_PATH_SEP) );
+ al_destroy_path(p);
translationComplete = false;
return true;
@@ -239,7 +241,7 @@ bool ContentLoader::reload_configs()
flushBuildingConfig(&customBuildingConfigs);
flushTerrainConfig(terrainFloorConfigs);
flushTerrainConfig(terrainBlockConfigs);
- flushColorConfig(colorConfigs);
+ colorConfigs.clear();
creatureConfigs.clear();
treeConfigs.clear();
shrubConfigs.clear();
@@ -247,7 +249,9 @@ bool ContentLoader::reload_configs()
flushImgFiles();
loadGraphicsFromDisk(); //these get destroyed when flushImgFiles is called.
- bool overallResult = parseContentIndexFile( "index.txt" );
+ ALLEGRO_PATH * p = al_create_path("stonesense/index.txt");
+ bool overallResult = parseContentIndexFile( al_path_cstr(p, ALLEGRO_NATIVE_PATH_SEP) );
+ al_destroy_path(p);
return overallResult;
}