Merge pull request #158 from DFHack/desmell

Desmell, part 3a
DFHack · Jan 21, 2025 · 9353a43 · 9353a43
2 parents b44dfa4 + a3ba5ec
commit 9353a43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/GroundMaterialConfiguration.cpp b/GroundMaterialConfiguration.cpp
@@ -339,7 +339,7 @@ namespace
 bool addSingleTerrainConfig(TiXmlElement* elemRoot)
 {
     int basefile = loadImgFromXML(elemRoot);
-    if (basefile == INVALID_INDEX)
+    if (elemRoot->Attribute("file") != NULL && basefile == INVALID_INDEX)
         return false;
 
     std::string elementType = elemRoot->Value();

diff --git a/TreeGrowthConfiguration.cpp b/TreeGrowthConfiguration.cpp
@@ -46,7 +46,7 @@ void parseGrowthElement(TiXmlElement* elemGrowthSprite, MaterialMatcher<c_sprite
 bool addSingleGrowthConfig(TiXmlElement* elemRoot)
 {
     int basefile = loadImgFromXML(elemRoot);
-    if (basefile == INVALID_INDEX)
+    if (elemRoot->Attribute("file") != NULL && basefile == INVALID_INDEX)
         return false;
 
     std::string elementType = elemRoot->Value();