summaryrefslogtreecommitdiff
path: root/ContentLoader.cpp
diff options
context:
space:
mode:
authorJapa2010-08-31 17:06:42 +0000
committerJapa2010-08-31 17:06:42 +0000
commit26d5373559175dff3db0baaaa011edb5999584b1 (patch)
tree9cb2d65cf680acc5cfdbc3057a35de4e34bc993b /ContentLoader.cpp
parentfce2e4c3304db3ac29046c769b54ea0f219f3321 (diff)
downloadstonesense-26d5373559175dff3db0baaaa011edb5999584b1.tar.gz
stonesense-26d5373559175dff3db0baaaa011edb5999584b1.tar.bz2
stonesense-26d5373559175dff3db0baaaa011edb5999584b1.tar.xz
fixed up some material stuff, so invalid material become iron, and obsidian tiles actually become obsidian.
Diffstat (limited to 'ContentLoader.cpp')
-rw-r--r--ContentLoader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index 07fdd66..7a2f230 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -207,6 +207,8 @@ bool ContentLoader::Load( DFHack::Context& DF){
//DF.Resume();
+ contentLoader.obsidian = lookupMaterialIndex(INORGANIC, "OBSIDIAN");
+
loadGraphicsFromDisk(); //these get destroyed when flushImgFiles is called.
bool overallResult = parseContentIndexFile( "index.txt" );
translationComplete = false;