From 515eb3b060004c9653f7f832ff5576ee00c8d74d Mon Sep 17 00:00:00 2001
From: expwnent <q309185@gmail.com>
Date: Mon, 17 Dec 2012 17:38:47 -0500
Subject: [PATCH] Reverted the silly changes to Buildings module that didn't
 work anyway.

---
 library/include/modules/Buildings.h |  5 -----
 library/modules/Buildings.cpp       | 25 +++++++------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h
index 91ec8684b..266aadcb8 100644
--- a/library/include/modules/Buildings.h
+++ b/library/include/modules/Buildings.h
@@ -178,10 +178,5 @@ DFHACK_EXPORT bool constructWithFilters(df::building *bld, std::vector<df::job_i
  */
 DFHACK_EXPORT bool deconstruct(df::building *bld);
 
-/**
- * Immediately deconstructs a building.
- */
-DFHACK_EXPORT bool deconstructImmediately(df::building *bld);
-
 }
 }
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index d6ee64515..6421114a1 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -1016,27 +1016,16 @@ bool Buildings::deconstruct(df::building *bld)
         bld->queueDestroy();
         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.
        Should only happen for abstract and unconstructed buildings.*/
-    
+
     if (bld->isSettingOccupancy())
     {
         markBuildingTiles(bld, true);
         bld->cleanupMap();
     }
-    
+
     bld->removeUses(false, false);
     // Assume: no parties.
     unlinkRooms(bld);
@@ -1047,16 +1036,16 @@ bool Buildings::deconstructImmediately(df::building *bld)
     // Assume: does not affect pathfinding
     bld->deconstructItems(false, false);
     // Don't clear arrows.
-    
+
     bld->uncategorize();
     delete bld;
-    
+
     if (world->selected_building == bld)
     {
         world->selected_building = NULL;
         world->update_selected_building = true;
     }
-    
+
     for (int i = ui_look_list->items.size()-1; i >= 0; i--)
     {
         auto item = ui_look_list->items[i];
@@ -1067,10 +1056,10 @@ bool Buildings::deconstructImmediately(df::building *bld)
             delete item;
         }
     }
-    
+
     Job::checkBuildingsNow();
     Job::checkDesignationsNow();
-    
+
     return true;
 }