From a9bd49393f4fc2a12bd5bbfc6df70f0c3022ae2e Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Tue, 14 Jan 2025 12:12:56 -0600 Subject: [PATCH] remove obsolete `t_building` this obsolete type is a leftover from DFHack's out of process days, vastly out of date and useless today... except in stonesense, which now has it locally (as `Stonesense_Building`) --- library/include/modules/Buildings.h | 33 ----------------------------- library/modules/Buildings.cpp | 18 ---------------- plugins/stonesense | 2 +- 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h index 6702999552..ee7fcdf698 100644 --- a/library/include/modules/Buildings.h +++ b/library/include/modules/Buildings.h @@ -58,34 +58,6 @@ class color_ostream; namespace Buildings { -/** - * Structure for holding a read DF building object - * \ingroup grp_buildings - */ -struct t_building -{ - uint32_t x1; - uint32_t y1; - uint32_t x2; - uint32_t y2; - uint32_t z; - t_matglossPair material; - df::building_type type; - union - { - int16_t subtype; - df::civzone_type civzone_type; - df::furnace_type furnace_type; - df::workshop_type workshop_type; - df::construction_type construction_type; - df::shop_type shop_type; - df::siegeengine_type siegeengine_type; - df::trap_type trap_type; - }; - int32_t custom_type; - df::building * origin; -}; - /** * The Buildings module - allows reading DF buildings * \ingroup grp_modules @@ -93,11 +65,6 @@ struct t_building */ DFHACK_EXPORT uint32_t getNumBuildings (); -/** - * read building by index - */ -DFHACK_EXPORT bool Read (const uint32_t index, t_building & building); - /** * read mapping from custom_type value to building RAW name * custom_type of -1 implies ordinary building diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp index b911d82e2e..a560a6fc99 100644 --- a/library/modules/Buildings.cpp +++ b/library/modules/Buildings.cpp @@ -278,24 +278,6 @@ uint32_t Buildings::getNumBuildings() return world->buildings.all.size(); } -bool Buildings::Read (const uint32_t index, t_building & building) -{ - df::building *bld = world->buildings.all[index]; - - building.x1 = bld->x1; - building.x2 = bld->x2; - building.y1 = bld->y1; - building.y2 = bld->y2; - building.z = bld->z; - building.material.index = bld->mat_index; - building.material.type = bld->mat_type; - building.type = bld->getType(); - building.subtype = bld->getSubtype(); - building.custom_type = bld->getCustomType(); - building.origin = bld; - return true; -} - bool Buildings::ReadCustomWorkshopTypes(map & btypes) { vector & bld_def = world->raws.buildings.all; diff --git a/plugins/stonesense b/plugins/stonesense index 13c215ce77..b39e81f63b 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 13c215ce77ba607c2e98dc4e629937e213d76f77 +Subproject commit b39e81f63be8b66f9feaa845f55a2792caed5ac4