Warning: does not work. Temp commit!

develop
expwnent 2012-08-24 11:40:51 -04:00
parent cb24f1e53a
commit 45efcfc763
3 changed files with 33 additions and 9 deletions

@ -173,5 +173,10 @@ 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);
} }
} }

@ -978,6 +978,17 @@ bool Buildings::deconstruct(df::building *bld)
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.*/

@ -10,8 +10,12 @@
#include "df/ui.h" #include "df/ui.h"
#include "df/unit.h" #include "df/unit.h"
#include "df/world.h" #include "df/world.h"
#include "modules/World.h"
#include "Types.h"
#include "modules/Buildings.h"
//crashes without Types.h
#include "modules/MapCache.h" #include "modules/MapCache.h"
#include "modules/World.h"
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@ -293,7 +297,11 @@ command_result diggingInvadersFunc(color_ostream &out, std::vector <std::string>
//found it! //found it!
foundIt = true; foundIt = true;
//destroy it //destroy it
building->deconstructItems(false, false); out.print("deconstructImmediately...\n");
DFHack::Buildings::deconstructImmediately(building);
out.print("done\n");
building = NULL;
//building->deconstructItems(false, false);
//building->removeUses(false, false); //building->removeUses(false, false);
break; break;
} }