From cf06dc35035188d522b1fef50ad6255cb9cd5bab Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Thu, 4 Sep 2014 08:26:45 -0500
Subject: [PATCH] Update to 0.40.11, fix a few devel plugins to build again

---
 CMakeLists.txt               | 2 +-
 library/xml                  | 2 +-
 plugins/devel/CMakeLists.txt | 2 +-
 plugins/devel/dumpmats.cpp   | 7 ++++++-
 plugins/devel/rprobe.cpp     | 6 +++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbe8f477d..d785df76d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
 endif()
 
 # set up versioning.
-set(DF_VERSION "0.40.10")
+set(DF_VERSION "0.40.11")
 SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.")
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/library/xml b/library/xml
index 22abf0604..6aa7bd032 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 22abf06043f4da188ec7e534d3a0f9d9052baf01
+Subproject commit 6aa7bd0325fabacc98f21f6accbd48aedaea3218
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
index b212f688c..d642f6256 100644
--- a/plugins/devel/CMakeLists.txt
+++ b/plugins/devel/CMakeLists.txt
@@ -2,7 +2,7 @@ IF(UNIX)
 DFHACK_PLUGIN(vectors vectors.cpp)
 endif()
 
-DFHACK_PLUGIN(autolabor2 autolabor2.cpp)
+#DFHACK_PLUGIN(autolabor2 autolabor2.cpp)
 DFHACK_PLUGIN(buildprobe buildprobe.cpp)
 DFHACK_PLUGIN(counters counters.cpp)
 DFHACK_PLUGIN(dumpmats dumpmats.cpp)
diff --git a/plugins/devel/dumpmats.cpp b/plugins/devel/dumpmats.cpp
index 5aabf807a..e50771a9f 100644
--- a/plugins/devel/dumpmats.cpp
+++ b/plugins/devel/dumpmats.cpp
@@ -231,7 +231,12 @@ command_result df_dumpmats (color_ostream &out, vector<string> &parameters)
         for (int i = 0; i < mat->reaction_class.size(); i++)
             out.print("\t[REACTION_CLASS:%s]\n", mat->reaction_class[i]->c_str());
         for (int i = 0; i < mat->reaction_product.id.size(); i++)
-            out.print("\t[MATERIAL_REACTION_PRODUCT:%s:%s:%s%s%s]\n", mat->reaction_product.id[i]->c_str(), mat->reaction_product.str[2][i]->c_str(), mat->reaction_product.str[3][i]->c_str(), mat->reaction_product.str[4][i]->size() ? ":" : "", mat->reaction_product.str[4][i]->c_str());
+        {
+            if ((*mat->reaction_product.str[0][i] == "NONE") && (*mat->reaction_product.str[1][i] == "NONE"))
+                out.print("\t[MATERIAL_REACTION_PRODUCT:%s:%s:%s%s%s]\n", mat->reaction_product.id[i]->c_str(), mat->reaction_product.str[2][i]->c_str(), mat->reaction_product.str[3][i]->c_str(), mat->reaction_product.str[4][i]->size() ? ":" : "", mat->reaction_product.str[4][i]->c_str());
+            else
+                out.print("\t[ITEM_REACTION_PRODUCT:%s:%s:%s:%s:%s%s%s]\n", mat->reaction_product.id[i]->c_str(), mat->reaction_product.str[0][i]->c_str(), mat->reaction_product.str[1][i]->c_str(), mat->reaction_product.str[2][i]->c_str(), mat->reaction_product.str[3][i]->c_str(), mat->reaction_product.str[4][i]->size() ? ":" : "", mat->reaction_product.str[4][i]->c_str());
+        }
 
         if (mat->hardens_with_water.mat_type != -1)
             out.print("\t[HARDENS_WITH_WATER:%s:%s%s%s]\n", mat->hardens_with_water.str[0].c_str(), mat->hardens_with_water.str[1].c_str(), mat->hardens_with_water.str[2].size() ? ":" : "", mat->hardens_with_water.str[2].c_str());
diff --git a/plugins/devel/rprobe.cpp b/plugins/devel/rprobe.cpp
index 9591fa8f1..f20222d8a 100644
--- a/plugins/devel/rprobe.cpp
+++ b/plugins/devel/rprobe.cpp
@@ -107,12 +107,12 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
     }
 
     df::world_data *data = world->world_data;
-    coord2d cur_region = screen->region_pos;
+    coord2d cur_region = screen->location.region_pos;
 
     // Compute biomes
-    for (int i = 0; i < screen->biome_rgn.size(); i++)
+    for (int i = 0; i < screen->location.biome_rgn.size(); i++)
     {
-        coord2d rg = screen->biome_rgn[i];
+        coord2d rg = screen->location.biome_rgn[i];
 
         auto rd = &data->region_map[rg.x][rg.y];