MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

develop
Petr Mrázek 2012-03-26 16:13:36 +02:00
parent eb5a364924 157f23be5c
commit 047ccdf43a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/DataDefs.cpp
Unescape Escape View File

@ -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;
}

2
library/include/RemoteTools.h
Unescape Escape View File

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