From ea6903862b9db407863a4b30b56605223db5788c Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Mon, 27 Nov 2023 20:38:35 -0600 Subject: [PATCH] change `unitst::owned_buildings` to `vector` actually simplifies things lol --- library/modules/Buildings.cpp | 8 +++----- library/xml | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp index 82f8faf53..124ecd3d8 100644 --- a/library/modules/Buildings.cpp +++ b/library/modules/Buildings.cpp @@ -357,17 +357,15 @@ bool Buildings::setOwner(df::building_civzonest *bld, df::unit *unit) if (bld->assigned_unit == unit) return true; - df::building * pbld = virtual_cast(bld); - if (bld->assigned_unit) { auto &blist = bld->assigned_unit->owned_buildings; - vector_erase_at(blist, linear_index(blist, pbld)); + vector_erase_at(blist, linear_index(blist, bld)); if (auto spouse = df::unit::find(bld->assigned_unit->relationship_ids[df::unit_relationship_type::Spouse])) { auto &blist = spouse->owned_buildings; - vector_erase_at(blist, linear_index(blist, pbld)); + vector_erase_at(blist, linear_index(blist, bld)); } } @@ -381,7 +379,7 @@ bool Buildings::setOwner(df::building_civzonest *bld, df::unit *unit) if (auto spouse = df::unit::find(unit->relationship_ids[df::unit_relationship_type::Spouse])) { auto &blist = spouse->owned_buildings; - if (bld->canUseSpouseRoom() && linear_index(blist, pbld) < 0) + if (bld->canUseSpouseRoom() && linear_index(blist, bld) < 0) blist.push_back(bld); } } diff --git a/library/xml b/library/xml index 6d246b716..ab028aa9f 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 6d246b716bbaf7de5ff9633293a859732c741d8c +Subproject commit ab028aa9fe8c75eb56c5e1a80cbd14d2a897bfc4