Merge https://github.com/angavrilov/dfhack

library/DataDefs.cpp

@@ -65,7 +65,10 @@ void *type_identity::allocate() {
 
 bool type_identity::copy(void *tgt, const void *src) {
     if (can_allocate() && tgt && src)
+    {
         do_copy(tgt, src);
+        return true;
+    }
     else
         return false;
 }

library/include/RemoteTools.h

@@ -40,7 +40,7 @@ namespace df
 
 namespace DFHack
 {
-    class MaterialInfo;
+    struct MaterialInfo;
 
     using google::protobuf::RepeatedField;
     using google::protobuf::RepeatedPtrField;