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

Reverted the silly changes to Buildings module that didn't work anyway.

develop
expwnent 2012-12-17 17:38:47 -05:00
parent ef80dbacde
commit 515eb3b060
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/include/modules/Buildings.h
Unescape Escape View File

@ -178,10 +178,5 @@ DFHACK_EXPORT bool constructWithFilters(df::building *bld, std::vector<df::job_i
*/ */
DFHACK_EXPORT bool deconstruct(df::building *bld); DFHACK_EXPORT bool deconstruct(df::building *bld);
/**
* Immediately deconstructs a building.
*/
DFHACK_EXPORT bool deconstructImmediately(df::building *bld);
} }
} }

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

@ -1016,27 +1016,16 @@ bool Buildings::deconstruct(df::building *bld)
bld->queueDestroy(); bld->queueDestroy();
return false; return false;
} }
return deconstructImmediately(bld);
}
bool Buildings::deconstructImmediately(df::building *bld)
{
using df::global::ui;
using df::global::world;
using df::global::ui_look_list;
CHECK_NULL_POINTER(bld);
/* Immediate destruction code path. /* Immediate destruction code path.
Should only happen for abstract and unconstructed buildings.*/ Should only happen for abstract and unconstructed buildings.*/
if (bld->isSettingOccupancy()) if (bld->isSettingOccupancy())
{ {
markBuildingTiles(bld, true); markBuildingTiles(bld, true);
bld->cleanupMap(); bld->cleanupMap();
} }
bld->removeUses(false, false); bld->removeUses(false, false);
// Assume: no parties. // Assume: no parties.
unlinkRooms(bld); unlinkRooms(bld);
@ -1047,16 +1036,16 @@ bool Buildings::deconstructImmediately(df::building *bld)
// Assume: does not affect pathfinding // Assume: does not affect pathfinding
bld->deconstructItems(false, false); bld->deconstructItems(false, false);
// Don't clear arrows. // Don't clear arrows.
bld->uncategorize(); bld->uncategorize();
delete bld; delete bld;
if (world->selected_building == bld) if (world->selected_building == bld)
{ {
world->selected_building = NULL; world->selected_building = NULL;
world->update_selected_building = true; world->update_selected_building = true;
} }
for (int i = ui_look_list->items.size()-1; i >= 0; i--) for (int i = ui_look_list->items.size()-1; i >= 0; i--)
{ {
auto item = ui_look_list->items[i]; auto item = ui_look_list->items[i];
@ -1067,10 +1056,10 @@ bool Buildings::deconstructImmediately(df::building *bld)
delete item; delete item;
} }
} }
Job::checkBuildingsNow(); Job::checkBuildingsNow();
Job::checkDesignationsNow(); Job::checkDesignationsNow();
return true; return true;
} }