updates for the great reorg

DFHack · Feb 8, 2025 · c349156 · c349156
1 parent 9d851db
commit c349156
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 21 deletions.
diff --git a/ContentBuildingReader.cpp b/ContentBuildingReader.cpp
@@ -13,7 +13,6 @@
 
 #include "df/building_def.h"
 #include "df/world.h"
-#include "df/world_raws.h"
 
 using std::string;
 

diff --git a/ContentLoader.cpp b/ContentLoader.cpp
@@ -30,7 +30,6 @@
 #include "df/material.h"
 #include "df/tissue_style_raw.h"
 #include "df/world.h"
-#include "df/world_raws.h"
 
 using std::vector;
 using std::string;
@@ -705,7 +704,7 @@ void ContentLoader::flushCreatureConfig()
     style_indices.clear();
 }
 
-void ContentLoader::gatherStyleIndices(df::world_raws * raws)
+void ContentLoader::gatherStyleIndices(df::world::T_raws * raws)
 {
     for(size_t creatureIndex = 0; creatureIndex < raws->creatures.all.size(); creatureIndex++)
     {

diff --git a/ContentLoader.h b/ContentLoader.h
@@ -15,10 +15,6 @@
 #include "ItemConfiguration.h"
 #include "common.h"
 
-namespace df {
-    struct world_raws;
-}
-
 class ContentLoader
 {
 private:
@@ -38,7 +34,7 @@ class ContentLoader
 
     bool translationComplete = false;
 
-    void gatherStyleIndices(df::world_raws * raws);
+    void gatherStyleIndices(df::world::T_raws * raws);
 public:
     ContentLoader(void);
     ~ContentLoader(void);

diff --git a/Creatures.cpp b/Creatures.cpp
@@ -621,9 +621,9 @@ void ReadCreaturesToSegment( DFHack::Core& DF, WorldSegment* segment)
             }
 
             // skip if not weapon or worn item
-            if(itemslot->mode != df::unit_inventory_item::T_mode::Weapon &&
-                itemslot->mode != df::unit_inventory_item::T_mode::Worn &&
-                itemslot->mode != df::unit_inventory_item::T_mode::Piercing) {
+            if(itemslot->mode != df::inv_item_role_type::Weapon &&
+                itemslot->mode != df::inv_item_role_type::Worn &&
+                itemslot->mode != df::inv_item_role_type::Piercing) {
                     continue;
             }
 

diff --git a/DumpInfo.cpp b/DumpInfo.cpp
@@ -25,7 +25,6 @@ be intended for use by people not interested in development.
 #include "df/itemdef_glovesst.h"
 #include "df/itemdef_pantsst.h"
 #include "df/world.h"
-#include "df/world_raws.h"
 
 //FIXME: filled with black magic
 void dumpSegment()
@@ -153,7 +152,7 @@ void dumpSegment()
 
 void DumpItemNamesToDisk(const char* filename)
 {
-    df::world_raws::T_itemdefs &defs = df::global::world->raws.itemdefs;
+    auto &defs = df::global::world->raws.itemdefs;
     FILE* fp = fopen(filename, "w");
     if(!fp) {
         return;

diff --git a/GUI.cpp b/GUI.cpp
@@ -667,14 +667,14 @@ namespace
         {
             draw_textf_border(font, uiColor(1), 2, (i++ * fontHeight), 0,
                 "tree name:%s type:%i", lookupTreeName(b->tree.index), b->tree.type);
-            uint16_t branches_dir = b->tree_tile.bits.branches_dir;
+            auto & tree_tile = b->tree_tile;
             draw_textf_border(font, uiColor(1), 2, (i++ * fontHeight), 0,
                 "tree tile:%s%s%s%s%s%s%s",
                 b->tree_tile.bits.trunk ? " trunk" : "",
-                (branches_dir & 0x1) ? " >" : "",
-                (branches_dir & 0x2) ? " v" : "",
-                (branches_dir & 0x4) ? " <" : "",
-                (branches_dir & 0x8) ? " ^" : "",
+                tree_tile.bits.branch_w ? " >" : "",
+                tree_tile.bits.branch_n ? " v" : "",
+                tree_tile.bits.branch_e ? " <" : "",
+                tree_tile.bits.branch_s ? " ^" : "",
                 b->tree_tile.bits.branches ? " branches" : "",
                 b->tree_tile.bits.leaves ? " leaves" : ""
             );

diff --git a/GameBuildings.cpp b/GameBuildings.cpp
@@ -13,6 +13,7 @@
 
 #include "df/buildings_other_id.h"
 #include "df/building_wellst.h"
+#include "df/buildingitemst.h"
 #include "df/item_constructed.h"
 #include "df/item_slabst.h"
 #include "df/itemimprovement.h"

diff --git a/MaterialMatcher.h b/MaterialMatcher.h
@@ -90,7 +90,7 @@ void MaterialMatcher<T>::set_material(T input, std::string token)
     // Only scan inorganics if the token looks like it's actually pointing at one
     if ((tokens[0] == "INORGANIC") || contains_wildcard(tokens[0]))
     {
-        for (size_t i = 0; i < world->raws.inorganics.size(); i++)
+        for (size_t i = 0; i < world->raws.inorganics.all.size(); i++)
         {
             mat.decode(0, i);
             check_match(input, token, mat.getToken(), 0, i);

diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
@@ -28,7 +28,6 @@
 #include "df/material.h"
 #include "df/unit.h"
 #include "df/world.h"
-#include "df/world_raws.h"
 
 constexpr auto ALL_BORDERS = 255;
 
@@ -702,7 +701,7 @@ void c_sprite::set_by_xml(TiXmlElement *elemSprite)
     } else if(!strcmp(equipsindexstr, "NONE")) {
         itemsubtype = INVALID_INDEX;
     } else {
-        df::world_raws::T_itemdefs &defs = df::global::world->raws.itemdefs;
+        auto &defs = df::global::world->raws.itemdefs;
         switch(itemtype) {
             using df::item_type;
         case item_type::WEAPON: