diff --git a/library/xml b/library/xml index ef5c180ff..e803099f5 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit ef5c180ff220e53ec6b51e01ca3594a5780b8b4b +Subproject commit e803099f5d983055e4b5b00a6baf4bcc91c6f25d diff --git a/plugins/building-hacks.cpp b/plugins/building-hacks.cpp index 2c75d4622..635d99261 100644 --- a/plugins/building-hacks.cpp +++ b/plugins/building-hacks.cpp @@ -88,8 +88,8 @@ struct work_hook : df::building_workshopst{ df::general_ref_creaturest* ref = static_cast(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); if (ref) { - info->produced = ref->anon_1; - info->consumed = ref->anon_2; + info->produced = ref->unk_1; + info->consumed = ref->unk_2; return true; } else @@ -118,14 +118,14 @@ struct work_hook : df::building_workshopst{ df::general_ref_creaturest* ref = static_cast(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); if (ref) { - ref->anon_1 = produced; - ref->anon_2 = consumed; + ref->unk_1 = produced; + ref->unk_2 = consumed; } else { ref = df::allocate(); - ref->anon_1 = produced; - ref->anon_2 = consumed; + ref->unk_1 = produced; + ref->unk_2 = consumed; general_refs.push_back(ref); } } diff --git a/plugins/orders.cpp b/plugins/orders.cpp index 85ba62486..fb678ca6d 100644 --- a/plugins/orders.cpp +++ b/plugins/orders.cpp @@ -467,7 +467,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri condition["order"] = it2->order_id; condition["condition"] = enum_item_key(it2->condition); - // TODO: anon_1 + // TODO: unk_1 conditions.append(condition); } @@ -475,7 +475,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri order["order_conditions"] = conditions; } - // TODO: anon_1 + // TODO: items orders.append(order); } @@ -873,13 +873,13 @@ static command_result orders_import(color_ostream &out, Json::Value &orders) continue; } - // TODO: anon_1 + // TODO: unk_1 order->order_conditions.push_back(condition); } } - // TODO: anon_1 + // TODO: items world->manager_orders.push_back(order); } diff --git a/scripts b/scripts index dab8b2246..274b81ded 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit dab8b22464cc81c7bc59e3e0f19ea3999676ffdf +Subproject commit 274b81ded9c72bff23eca4f0c2a78cb6cb900f8e