summaryrefslogtreecommitdiff
path: root/ContentLoader.cpp
diff options
context:
space:
mode:
authorJapa2011-02-18 05:30:00 +0000
committerJapa2011-02-18 05:30:00 +0000
commit4757c2d4e449be85400fbccc53ec1391c84f8673 (patch)
treee617912c61934017edc9c74d0321f6a240511ad9 /ContentLoader.cpp
parentf67f437e90145b94ebd016c3b4c41f9ee5e7cdc3 (diff)
downloadstonesense-4757c2d4e449be85400fbccc53ec1391c84f8673.tar.gz
stonesense-4757c2d4e449be85400fbccc53ec1391c84f8673.tar.bz2
stonesense-4757c2d4e449be85400fbccc53ec1391c84f8673.tar.xz
Got preliminary grass working.
Diffstat (limited to 'ContentLoader.cpp')
-rw-r--r--ContentLoader.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index 5f3bce4..1ad5c66 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -162,8 +162,22 @@ bool ContentLoader::Load( DFHack::Context& DF){
{
WriteErr("DFhack exeption: %s\n", e.what());
}
+ try
+ {
Bld = DF.getBuildings();
- contentLoader.MemInfo = DF.getMemoryInfo();
+ }
+ catch(exception &e)
+ {
+ WriteErr("DFhack exeption: %s\n", e.what());
+ }
+ try
+ {
+ contentLoader.MemInfo = DF.getMemoryInfo();
+ }
+ catch(exception &e)
+ {
+ WriteErr("DFhack exeption: %s\n", e.what());
+ }
if(professionStrings.empty())
{
for(int i=0;; i++)
@@ -348,6 +362,8 @@ bool ContentLoader::parseContentXMLFile( char* filepath ){
runningResult &= parseShrubContent( elemRoot );
else if( elementType.compare( "trees" ) == 0 )
runningResult &= parseTreeContent( elemRoot );
+ else if( elementType.compare( "grasses" ) == 0 )
+ runningResult &= parseGrassContent( elemRoot );
else if( elementType.compare( "colors" ) == 0 )
runningResult &= parseColorContent( elemRoot );
else if( elementType.compare( "fluids" ) == 0 )
@@ -378,6 +394,10 @@ bool ContentLoader::parseTreeContent(TiXmlElement* elemRoot ){
return addSingleVegetationConfig( elemRoot, &treeConfigs, Mats->organic );
}
+bool ContentLoader::parseGrassContent(TiXmlElement* elemRoot ){
+ return addSingleVegetationConfig( elemRoot, &grassConfigs, Mats->organic );
+}
+
bool ContentLoader::parseTerrainContent(TiXmlElement* elemRoot ){
return addSingleTerrainConfig( elemRoot );
}