diff --git a/library/include/modules/Constructions.h b/library/include/modules/Constructions.h index 9e2150dd6..cc9fef2b1 100644 --- a/library/include/modules/Constructions.h +++ b/library/include/modules/Constructions.h @@ -46,7 +46,7 @@ namespace Constructions struct t_construction { df::coord pos; df::item_type item_type; - int16_t unk; + int16_t item_subtype; int16_t mat_type; int32_t mat_index; df::construction_flags flags; diff --git a/library/include/modules/kitchen.h b/library/include/modules/kitchen.h index a18011390..fab387288 100644 --- a/library/include/modules/kitchen.h +++ b/library/include/modules/kitchen.h @@ -49,7 +49,7 @@ typedef uint8_t t_exclusionType; const unsigned int seedLimit = 400; // a limit on the limits which can be placed on seeds const t_itemSubtype organicSubtype = -1; // seems to fixed const t_exclusionType cookingExclusion = 1; // seems to be fixed -const t_itemType limitType = 0; // used to store limit as an entry in the exclusion list. 0 = BAR +const df::enums::item_type::item_type limitType = df::enums::item_type::BAR; // used to store limit as an entry in the exclusion list. 0 = BAR const t_itemSubtype limitSubtype = 0; // used to store limit as an entry in the exclusion list const t_exclusionType limitExclusion = 4; // used to store limit as an entry in the exclusion list diff --git a/library/modules/Constructions.cpp b/library/modules/Constructions.cpp index 0f371b56a..ac9057075 100644 --- a/library/modules/Constructions.cpp +++ b/library/modules/Constructions.cpp @@ -67,7 +67,7 @@ bool Constructions::copyConstruction(const int32_t index, t_construction &out) out.pos = out.origin->pos; out.item_type = out.origin->item_type; - out.unk = out.origin->anon_1; + out.item_subtype = out.origin->item_subtype; out.mat_type = out.origin->mat_type; out.mat_index = out.origin->mat_index; out.flags = out.origin->flags;