Merge remote-tracking branch 'upstream/master'

library/VersionInfoFactory.cpp

@@ -125,7 +125,10 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
                 throw Error::MemoryXmlUnderspecifiedEntry(cstr_name);
             const char *cstr_value = pMemEntry->Attribute("value");
             if(!cstr_value)
-                throw Error::MemoryXmlUnderspecifiedEntry(cstr_name);
+            {
+                cerr << "Dummy symbol table entry: " << cstr_key << endl;
+                continue;
+            }
             mem->setAddress(cstr_key, strtol(cstr_value, 0, 0));
         }
         else if (type == "md5-hash")

library/modules/Gui.cpp

@@ -43,7 +43,7 @@ using namespace DFHack;
 
 #include "DataDefs.h"
 #include "df/world.h"
-#include "df/cursor.h"
+#include "df/global_objects.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/viewscreen_joblistst.h"
 #include "df/viewscreen_itemst.h"
@@ -60,7 +60,6 @@ using namespace DFHack;
 #include "df/popup_message.h"
 #include "df/interface.h"
 #include "df/graphic.h"
-#include "df/selection_rect.h"
 
 using namespace df::enums;
 using df::global::gview;

library/xml

@@ -1 +1 @@
-Subproject commit 56184ced21d1f465f5f255e1c01ac48213c0ea4a
+Subproject commit 6d44d3c11dd9f23e0665a1af9538a84ec627e333

plugins/cleaners.cpp

@@ -9,7 +9,7 @@
 #include "df/unit.h"
 #include "df/unit_spatter.h"
 #include "df/matter_state.h"
-#include "df/cursor.h"
+#include "df/global_objects.h"
 #include "df/builtin_mats.h"
 #include "df/contaminant.h"
 

plugins/stockpiles.cpp

@@ -7,7 +7,7 @@
 #include "df/world.h"
 #include "df/ui.h"
 #include "df/building_stockpilest.h"
-#include "df/selection_rect.h"
+#include "df/global_objects.h"
 #include "df/viewscreen_dwarfmodest.h"
 
 using std::vector;