From 9d143d8afb07f7d4fffa895829621b5ab97de791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 7 Jun 2010 01:54:40 +0200
Subject: [PATCH] Fix creature vector on windows

---
 output/Memory.xml                    | 2 +-
 tools/examples/construction_dump.cpp | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/output/Memory.xml b/output/Memory.xml
index 791c753a7..39df9cbd0 100755
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1600,7 +1600,7 @@ map_data_1b60_offset          0x1B9c
     <Entry version="v0.31.05" os="windows" id="0.31.05" base="0.31.04" rebase="0x8010">
         <String name="md5">394ff63fc00fedd5df0b36e4beb589bc</String>
         <HexValue name="pe_timestamp">0x4c091569</HexValue>
-        <Address name="creature_vector">0x1678704</Address> CHMOD
+        <!--<Address name="creature_vector">0x1678704</Address> CHMOD-->
         <Address name="dwarf_race_index">0x014abee4</Address> CHMOD
         <Address name="dwarf_civ_id">0x1471FB0</Address> BOGUS!
 <!--
diff --git a/tools/examples/construction_dump.cpp b/tools/examples/construction_dump.cpp
index 26bbef35d..4eee39ed8 100644
--- a/tools/examples/construction_dump.cpp
+++ b/tools/examples/construction_dump.cpp
@@ -36,6 +36,7 @@ int main (int numargs, const char ** args)
     DFHack::Constructions *Cons = DF->getConstructions();
     DFHack::Materials *Mats = DF->getMaterials();
     Mats->ReadInorganicMaterials();
+    Mats->ReadOrganicMaterials();
     uint32_t numConstr;
     Cons->Start(numConstr);
     
@@ -59,6 +60,12 @@ int main (int numargs, const char ** args)
                         matstr = Mats->inorganic[con.mat_idx].id;
                     else matstr = "inorganic";
                 }
+                if(con.mat_type == 420)
+                {
+                    if(con.mat_idx != 0xffffffff)
+                        matstr = Mats->organic[con.mat_idx].id;
+                    else matstr = "organic";
+                }
                 switch(con.form)
                 {
                     case constr_bar: