Update cleaners/drybuckets, Materials module now gone

MithrilTuxedo · Jan 11, 2012 · 1f8a005 · 1f8a005
1 parent 24576ff
commit 1f8a005
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp
@@ -12,8 +12,7 @@
 #include "df/unit.h"
 #include "df/matter_state.h"
 #include "df/cursor.h"
-
-#include "modules/Materials.h"
+#include "df/builtin_mats.h"
 
 using std::vector;
 using std::string;
@@ -48,12 +47,12 @@ command_result cleanmap (Core * c, bool snow, bool mud)
 
             // filter snow
             if(!snow
-                && spatter->mat_type == DFHack::Materials::WATER
+                && spatter->mat_type == df::builtin_mats::WATER
                 && spatter->mat_state == df::matter_state::Powder)
                 continue;
             // filter mud
             if(!mud
-                && spatter->mat_type == DFHack::Materials::MUD
+                && spatter->mat_type == df::builtin_mats::MUD
                 && spatter->mat_state == df::matter_state::Solid)
                 continue;
 

diff --git a/plugins/drybuckets.cpp b/plugins/drybuckets.cpp
@@ -8,8 +8,7 @@
 #include <DataDefs.h>
 #include "df/world.h"
 #include "df/item.h"
-
-#include "modules/Materials.h"
+#include "df/builtin_mats.h"
 
 using std::string;
 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++)
 	{
 		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;
 			dried_total++;