From 3168a2ef620751f7741d43ae47679c7145715325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 16 Mar 2012 20:41:07 +0100
Subject: [PATCH] Add a tiletype function to get basic shapes from shapes.
 Track modules.

---
 library/Console-linux.cpp   | 1 -
 library/include/TileTypes.h | 6 ++++++
 library/xml                 | 2 +-
 plugins/stonesense          | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/Console-linux.cpp b/library/Console-linux.cpp
index 92f621a8b..9a0905647 100644
--- a/library/Console-linux.cpp
+++ b/library/Console-linux.cpp
@@ -50,7 +50,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdlib>
 #include <iostream>
 #include <sstream>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 #include <stdarg.h>
diff --git a/library/include/TileTypes.h b/library/include/TileTypes.h
index 835be2398..26df7c3cd 100644
--- a/library/include/TileTypes.h
+++ b/library/include/TileTypes.h
@@ -153,6 +153,12 @@ namespace DFHack
         return ENUM_ATTR(tiletype, shape, tiletype);
     }
 
+    inline
+    df::tiletype_shape_basic tileShapeBasic(df::tiletype_shape tileshape)
+    {
+        return ENUM_ATTR(tiletype_shape, basic_shape, tileshape);
+    }
+
     inline
     df::tiletype_special tileSpecial(df::tiletype tiletype)
     {
diff --git a/library/xml b/library/xml
index 59181edc3..08e1f71e8 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 59181edc3d904328851b7e7914412fc2dd6f81a5
+Subproject commit 08e1f71e89c1af6b3bef940914ed7f3d8fed89b0
diff --git a/plugins/stonesense b/plugins/stonesense
index bb7bcc00c..fa17ba5de 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit bb7bcc00c4eb2e46e5d7141fb2d0ce8a30386568
+Subproject commit fa17ba5de0a003c135150516cd9c80205ac3f9f1