remove save fixup

Add notifyCivzoneModified
develop
20k 2023-01-19 17:49:24 +00:00
parent d5610ab859
commit 8b7c8d83b5
4 changed files with 21 additions and 24 deletions

@ -1998,6 +1998,11 @@ Low-level building creation functions:
Destroys the building, or queues a deconstruction job. Destroys the building, or queues a deconstruction job.
Returns *true* if the building was destroyed and deallocated immediately. Returns *true* if the building was destroyed and deallocated immediately.
* ``dfhack.buildings.notifyCivzoneModified(building)``
Rebuilds the civzone <-> overlapping building association mapping.
Call after changing extents or modifying size in some fashion
* ``dfhack.buildings.markedForRemoval(building)`` * ``dfhack.buildings.markedForRemoval(building)``
Returns *true* if the building is marked for removal (with :kbd:`x`), *false* Returns *true* if the building is marked for removal (with :kbd:`x`), *false*

@ -2239,6 +2239,7 @@ static const LuaWrapper::FunctionReg dfhack_buildings_module[] = {
WRAPM(Buildings, constructWithItems), WRAPM(Buildings, constructWithItems),
WRAPM(Buildings, constructWithFilters), WRAPM(Buildings, constructWithFilters),
WRAPM(Buildings, deconstruct), WRAPM(Buildings, deconstruct),
WRAPM(Buildings, notifyCivzoneModified),
WRAPM(Buildings, markedForRemoval), WRAPM(Buildings, markedForRemoval),
WRAPM(Buildings, getRoomDescription), WRAPM(Buildings, getRoomDescription),
WRAPM(Buildings, isActivityZone), WRAPM(Buildings, isActivityZone),

@ -202,6 +202,11 @@ DFHACK_EXPORT bool deconstruct(df::building *bld);
*/ */
DFHACK_EXPORT bool markedForRemoval(df::building *bld); DFHACK_EXPORT bool markedForRemoval(df::building *bld);
/**
* Rebuilds a civzones building associations after it has been modified
*/
DFHACK_EXPORT void notifyCivzoneModified(df::building* bld);
void updateBuildings(color_ostream& out, void* ptr); void updateBuildings(color_ostream& out, void* ptr);
void clearBuildings(color_ostream& out); void clearBuildings(color_ostream& out);

@ -114,36 +114,18 @@ static df::building_extents_type *getExtentTile(df::building_extents &extent, df
return &extent.extents[dx + dy*extent.width]; return &extent.extents[dx + dy*extent.width];
} }
void add_building_to_all_zones(df::building* bld);
static void buildings_fixzones()
{
auto& vec = world->buildings.other[buildings_other_id::IN_PLAY];
bool changed = false;
for (size_t i = 0; i < vec.size(); i++)
{
df::building* bld = vec[i];
add_building_to_all_zones(bld);
}
}
/* /*
* A monitor to work around this bug, in its application to buildings: * A monitor to work around this bug, in its application to buildings:
* *
* http://www.bay12games.com/dwarves/mantisbt/view.php?id=1416 * http://www.bay12games.com/dwarves/mantisbt/view.php?id=1416
*/ */
bool buildings_do_onupdate = false; bool buildings_do_onupdate = false;
static bool buildings_do_fixzones = false;
void buildings_onStateChange(color_ostream &out, state_change_event event) void buildings_onStateChange(color_ostream &out, state_change_event event)
{ {
switch (event) { switch (event) {
case SC_MAP_LOADED: case SC_MAP_LOADED:
buildings_do_onupdate = true; buildings_do_onupdate = true;
buildings_do_fixzones = true;
break; break;
case SC_MAP_UNLOADED: case SC_MAP_UNLOADED:
buildings_do_onupdate = false; buildings_do_onupdate = false;
@ -155,12 +137,6 @@ void buildings_onStateChange(color_ostream &out, state_change_event event)
void buildings_onUpdate(color_ostream &out) void buildings_onUpdate(color_ostream &out)
{ {
if (buildings_do_fixzones)
{
buildings_fixzones();
buildings_do_fixzones = false;
}
buildings_do_onupdate = false; buildings_do_onupdate = false;
df::job_list_link *link = world->jobs.list.next; df::job_list_link *link = world->jobs.list.next;
@ -1450,6 +1426,16 @@ bool Buildings::markedForRemoval(df::building *bld)
return false; return false;
} }
void Buildings::notifyCivzoneModified(df::building* bld)
{
if (bld->getType() != building_type::Civzone)
return;
//remove zone here needs to be the slow method
remove_zone_from_all_buildings(bld);
add_zone_to_all_buildings(bld);
}
void Buildings::clearBuildings(color_ostream& out) { void Buildings::clearBuildings(color_ostream& out) {
corner1.clear(); corner1.clear();
corner2.clear(); corner2.clear();