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

Update cleaners/drybuckets, Materials module now gone

develop
Quietust 2012-01-11 08:58:26 -06:00
parent 24576ffe19
commit 1f8a005818
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/cleaners.cpp
Unescape Escape View File

@ -12,8 +12,7 @@
#include "df/unit.h" #include "df/unit.h"
#include "df/matter_state.h" #include "df/matter_state.h"
#include "df/cursor.h" #include "df/cursor.h"
#include "df/builtin_mats.h"
#include "modules/Materials.h"
using std::vector; using std::vector;
using std::string; using std::string;
@ -48,12 +47,12 @@ command_result cleanmap (Core * c, bool snow, bool mud)
// filter snow // filter snow
if(!snow if(!snow
&& spatter->mat_type == DFHack::Materials::WATER && spatter->mat_type == df::builtin_mats::WATER
&& spatter->mat_state == df::matter_state::Powder) && spatter->mat_state == df::matter_state::Powder)
continue; continue;
// filter mud // filter mud
if(!mud if(!mud
&& spatter->mat_type == DFHack::Materials::MUD && spatter->mat_type == df::builtin_mats::MUD
&& spatter->mat_state == df::matter_state::Solid) && spatter->mat_state == df::matter_state::Solid)
continue; continue;

5
plugins/drybuckets.cpp
Unescape Escape View File

@ -8,8 +8,7 @@
#include <DataDefs.h> #include <DataDefs.h>
#include "df/world.h" #include "df/world.h"
#include "df/item.h" #include "df/item.h"
#include "df/builtin_mats.h"
#include "modules/Materials.h"
using std::string; using std::string;
using std::vector; using std::vector;
@ -28,7 +27,7 @@ DFhackCExport command_result df_drybuckets (Core * c, vector <string> & paramete
for (int i = 0; i < world->items.all.size(); i++) for (int i = 0; i < world->items.all.size(); i++)
{ {
df::item *item = world->items.all[i]; df::item *item = world->items.all[i];
if ((item->getType() == df::item_type::LIQUID_MISC) && (item->getMaterial() == DFHack::Materials::WATER)) if ((item->getType() == df::item_type::LIQUID_MISC) && (item->getMaterial() == df::builtin_mats::WATER))
{ {
item->flags.bits.garbage_colect = 1; item->flags.bits.garbage_colect = 1;
dried_total++; dried_total++;