From c13b7c035f50a293a0f764c574961c2aad8d0078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 19 Nov 2010 01:14:41 +0100
Subject: [PATCH] Fix weather tool/offsets for 31.18. Added a file I missed.

---
 data/Memory-ng.xml          |  2 +-
 library/DFTileTypes.cpp     | 31 +++++++++++++++++++++++++++++++
 tools/supported/weather.cpp |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 library/DFTileTypes.cpp

diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index 212c87b7d..537e2a2da 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -1867,7 +1867,7 @@
             <Group name="World" valid="false">
                 <Address name="current_tick" description="Current time of the year" />
                 <Address name="current_year" description="Current year" />
-                <Address name="current_weather" description="5x5 array of bytes for surrounding biomes. For each: 0=clear, 1=raining, 2=snowing." />
+                <Address name="current_weather" value="0x14c9bb8" valid="true" />
             </Group>
 
         </Offsets>
diff --git a/library/DFTileTypes.cpp b/library/DFTileTypes.cpp
new file mode 100644
index 000000000..3064aa007
--- /dev/null
+++ b/library/DFTileTypes.cpp
@@ -0,0 +1,31 @@
+// vim: sts=4 sta et shiftwidth=4:
+#include "dfhack/DFIntegers.h"
+#include "dfhack/DFTileTypes.h"
+#include "dfhack/DFExport.h"
+
+namespace DFHack {
+    //set tile class string lookup table (e.g. for printing to user)
+#define X(name,comment) #name,
+    DFHACK_EXPORT const char * TileClassString[tileclass_count+1] = {
+        TILECLASS_MACRO
+            0
+    };
+#undef X
+
+    //string lookup table (e.g. for printing to user)
+#define X(name,comment) #name,
+    DFHACK_EXPORT const char * TileMaterialString[tilematerial_count+1] = {
+        TILEMATERIAL_MACRO
+            0
+    };
+#undef X
+
+    //string lookup table (e.g. for printing to user)
+#define X(name,comment) #name,
+    DFHACK_EXPORT const char * TileSpecialString[tilespecial_count+1] = {
+        TILESPECIAL_MACRO
+            0
+    };
+#undef X
+
+}
diff --git a/tools/supported/weather.cpp b/tools/supported/weather.cpp
index 5ded20649..8e8a936bc 100644
--- a/tools/supported/weather.cpp
+++ b/tools/supported/weather.cpp
@@ -114,6 +114,7 @@ int main (int argc, char** argv)
             cin.ignore();
         }
     #endif
+    DF->Resume();
     DF->Detach();
     return 0;
 }