MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update with squad removal support

develop
20k 2023-01-20 18:02:55 +00:00
parent bb16009f49
commit 8c68f54f50
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
library/modules/Buildings.cpp
Unescape Escape View File

@ -82,6 +82,7 @@ using namespace DFHack;
#include "df/map_block.h"
#include "df/tile_occupancy.h"
#include "df/plotinfost.h"
#include "df/squad.h"
#include "df/ui_look_list.h"
#include "df/unit.h"
#include "df/unit_relationship_type.h"
@ -1348,6 +1349,43 @@ bool Buildings::constructWithFilters(df::building *bld, std::vector<df::job_item
return true;
}
static void delete_civzone_squad_links(df::building* bld)
{
if (bld->getType() != building_type::Civzone)
return;
auto zone = strict_virtual_cast<df::building_civzonest>(bld);
if (zone == nullptr)
return;
for (df::building_civzonest::T_squad_room_info* room_info : zone->squad_room_info)
{
int32_t squad_id = room_info->squad_id;
df::squad* squad = df::squad::find(squad_id);
//if this is null, something has gone just *terribly* wrong
if (squad)
{
for (int i=0; i < squad->rooms.size(); i++)
{
if (squad->rooms[i]->building_id == bld->id)
{
auto room = squad->rooms[i];
squad->rooms.erase(squad->rooms.begin() + i);
delete room;
i--;
}
}
}
delete room_info;
}
zone->squad_room_info.clear();
}
bool Buildings::deconstruct(df::building *bld)
{
using df::global::plotinfo;
@ -1388,6 +1426,8 @@ bool Buildings::deconstruct(df::building *bld)
remove_building_from_all_zones(bld);
remove_zone_from_all_buildings(bld);
delete_civzone_squad_links(bld);
delete bld;
if (world->selected_building == bld)