Fixed custom workshops not being properly applied.

BuildingConfiguration.cpp

@@ -5,13 +5,12 @@
 
 bool BuildingNamesTranslatedFromGame = false;
 
-BuildingConfiguration::BuildingConfiguration(string name, int game_type, int game_subtype, std::string str_custom)
+BuildingConfiguration::BuildingConfiguration(string name, int game_type, int game_subtype, int32_t custom)
 {
     this->name = name;
     this->game_type = game_type;
     this->game_subtype = game_subtype;
-    this->game_custom = -1;
-    this->str_custom = str_custom;
+    this->game_custom = custom;
     this->width = this->height = 1;
     this->canBeFloating = false;
     this->canBeAnySize = false;
@@ -23,7 +22,6 @@ BuildingConfiguration::BuildingConfiguration()
     this->game_type = -1;
     this->game_subtype = -1;
     this->game_custom = -1;
-    this->str_custom = str_custom;
     this->width = this->height = 1;
     this->canBeFloating = false;
     this->canBeAnySize = false;

BuildingConfiguration.h

@@ -9,14 +9,13 @@ class BuildingConfiguration
     int32_t game_type;
     int32_t game_subtype;
     int32_t game_custom;
-    std::string str_custom;
     uint32_t width, height;
     std::string name;
     bool canBeFloating;
     bool canBeAnySize;
     SpriteNode* sprites;
 
-    BuildingConfiguration(std::string name, int game_type, int game_subtype, std::string game_custom);
+    BuildingConfiguration(std::string name, int game_type, int game_subtype, int32_t game_custom);
     BuildingConfiguration();
     ~BuildingConfiguration(void);
 };

ContentBuildingReader.cpp

@@ -9,6 +9,8 @@
 #include "tinyxml.h"
 #include "GUI.h"
 #include "ContentLoader.h"
+#include "df/world_raws.h"
+#include "df/building_def.h"
 
 int parseConditionNode(ConditionalNode* node, TiXmlElement* elemCondition, bool silent);
 bool parseSpriteNode(SpriteNode* node, TiXmlElement* elemParent);
@@ -396,13 +398,24 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot,  vector<BuildingConfigurat
         break;
     }
     }
-    string custom;
+    int32_t custom = -1;
     // needs custom building spec, doesn't have a string... FAIL
-    if (needs_custom && !strGameCustom) {
+    if (needs_custom && (strGameCustom == 0 || strGameCustom[0] == 0)) {
         contentError("<building> game_custom attribute is required, but missng.",elemRoot);
         return false;
-    } else if (strGameCustom) {
-        custom = strGameCustom;
+    }
+    else if (strGameCustom && strGameCustom[0])
+    {
+        for (int i = 0; i < df::global::world->raws.buildings.all.size(); i++)
+        {
+            if (strcmp(strGameCustom, df::global::world->raws.buildings.all[i]->code.c_str()) == 0)
+                custom = i;
+        }
+        if (custom == -1)
+        {
+            contentWarning("<building> game_custom attribute is invalid", elemRoot);
+            return false;
+        }
     }
     BuildingConfiguration building(strName, main_type, subtype, custom );
     RootTile* spriteroot = new RootTile();

Tile.cpp

@@ -291,7 +291,7 @@ void Tile::AssembleTile( void )
 
     bool defaultSnow = 1;
     t_SpriteWithOffset sprite;
-    c_sprite* spriteobject;
+    c_sprite* spriteobject = 0;
 
 	int32_t drawx = 0;
 	int32_t drawy = 0;

resources/buildings/Soapmakers.xml

@@ -53,7 +53,8 @@
 			<HaveFloor />
 			<PositionIndex value=0 />
 		</and>
-		<sprite index = 202 />
+		<sprite index = 222 color="building" pattern_index="1" />
+		<sprite index = 223 />
 	</else>
 
 	<if>