From 76939afe500893b1ec7c17179f77dc9392e8a68c Mon Sep 17 00:00:00 2001
From: belal <jimbelal@gmail.com>
Date: Sun, 14 Mar 2010 20:04:31 -0400
Subject: [PATCH 1/2] fix incorrect squad name offset

---
 output/Memory.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/output/Memory.xml b/output/Memory.xml
index fc7918e78..318e9a985 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -847,7 +847,7 @@
         <Offset name="creature_flags2">0xE8</Offset>
         <Offset name="creature_sex">0xF2</Offset>
         <Offset name="creature_id">0xF4</Offset>
-        <Offset name="creature_squad_name">0x1A4</Offset>
+        <Offset name="creature_squad_name">0x158</Offset>
         <Offset name="creature_mood">0x1F8</Offset>
         <Offset name="creature_squad_leader_id">0x228</Offset>
         <Offset name="creature_money">0x2F8</Offset><!-- this is wrong -->

From a2eb3a68925b877cd65f999de6ce2dcde3bbb6b2 Mon Sep 17 00:00:00 2001
From: belal <jimbelal@gmail.com>
Date: Sun, 14 Mar 2010 20:26:32 -0400
Subject: [PATCH 2/2] add iostream to DFProcess.h include, std:: prefix to the
 output line, DT was getting mad about them not being defined

---
 library/DFProcess.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/DFProcess.h b/library/DFProcess.h
index 3a023ca2d..c710d7e88 100644
--- a/library/DFProcess.h
+++ b/library/DFProcess.h
@@ -27,6 +27,7 @@ distribution.
 
 #include "Tranquility.h"
 #include "Export.h"
+#include <iostream>
 
 namespace DFHack
 {
@@ -55,7 +56,7 @@ namespace DFHack
         }
         inline void print()
         {
-            cout << hex << start << " - " << end << "|" << (read ? "r" : "-") << (write ? "w" : "-") << (execute ? "x" : "-") << "|" << name << endl;
+            std::cout << std::hex << start << " - " << end << "|" << (read ? "r" : "-") << (write ? "w" : "-") << (execute ? "x" : "-") << "|" << name << std::endl;
         }
     };