Merge pull request #4068 from ab9rf/owned_buildings

change `unitst::owned_buildings` to `vector<building_civzonest*>`
DFHack · Nov 29, 2023 · 82cbff4 · 82cbff4
2 parents 45422b9 + ea69038
commit 82cbff4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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<df::building>(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