From 8065867a3b529b3f076595e05f83ee21093a6ba3 Mon Sep 17 00:00:00 2001
From: simon <simon@banquise.net>
Date: Wed, 28 Apr 2010 17:40:27 +0200
Subject: [PATCH] moving the t_material structure to the Materials.h file

---
 dfhack/APIPrivate.cpp              |  4 ++--
 dfhack/include/modules/Creatures.h |  8 --------
 dfhack/include/modules/Materials.h | 10 ++++++++++
 dfhack/modules/Creatures.cpp       |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dfhack/APIPrivate.cpp b/dfhack/APIPrivate.cpp
index 9d41a0639..74df2b358 100644
--- a/dfhack/APIPrivate.cpp
+++ b/dfhack/APIPrivate.cpp
@@ -7,9 +7,9 @@
 #include "DFMemInfo.h"
 #include "DFProcess.h"
 
+#include "modules/Materials.h"
 #include "modules/Creatures.h"
 #include "modules/Maps.h"
-#include "modules/Materials.h"
 #include "modules/Position.h"
 #include "modules/Translation.h"
 #include "modules/Vegetation.h"
@@ -59,4 +59,4 @@ void APIPrivate::readName(t_name & name, uint32_t address)
     p->readSTLString(address + name_firstname_offset , name.first_name, 128);
     p->readSTLString(address + name_nickname_offset , name.nickname, 128);
     p->read(address + name_words_offset ,48, (uint8_t *) name.words);
-}
\ No newline at end of file
+}
diff --git a/dfhack/include/modules/Creatures.h b/dfhack/include/modules/Creatures.h
index 910d7ff18..c5e8d8640 100644
--- a/dfhack/include/modules/Creatures.h
+++ b/dfhack/include/modules/Creatures.h
@@ -260,14 +260,6 @@ namespace DFHack
         uint32_t experience;
         uint16_t rating;
     };
-    struct t_material
-    {
-        int16_t typeA;
-        int16_t typeB;
-        int16_t typeC;
-        int32_t typeD;
-	uint32_t flags;
-    };
     struct t_job
     {
         bool active;
diff --git a/dfhack/include/modules/Materials.h b/dfhack/include/modules/Materials.h
index f4073c1ca..65a18776b 100644
--- a/dfhack/include/modules/Materials.h
+++ b/dfhack/include/modules/Materials.h
@@ -58,6 +58,16 @@ namespace DFHack
 		uint16_t bright;
 	} tilecolor;
     };
+
+    // this structure describes what are things made of in the DF world
+    struct t_material
+    {
+	    int16_t typeA;
+	    int16_t typeB;
+	    int16_t typeC;
+	    int32_t typeD;
+	    uint32_t flags;
+    };
     
     class DFHACK_EXPORT Materials
     {
diff --git a/dfhack/modules/Creatures.cpp b/dfhack/modules/Creatures.cpp
index 68376f2dd..52948308f 100644
--- a/dfhack/modules/Creatures.cpp
+++ b/dfhack/modules/Creatures.cpp
@@ -35,6 +35,7 @@ distribution.
 #include <shms.h>
 #include <mod-core.h>
 #include <mod-creature2010.h>
+#include "modules/Materials.h"
 #include "modules/Creatures.h"