summaryrefslogtreecommitdiff
path: root/library/DataDefs.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-02-11 18:48:17 +0100
committerPetr Mrázek2012-02-11 18:48:17 +0100
commit8527547cbe050cb0b5e50c162354f1eb069a554a (patch)
tree19165341f455a79f01745e1bcd2c70b7e8183058 /library/DataDefs.cpp
parentaee5efe7c0d0cdf784fb8bdb445cc233435d47dd (diff)
parentf469fab1e6e419ff26655bc3fe9868653dc0f0f0 (diff)
downloaddfhack-8527547cbe050cb0b5e50c162354f1eb069a554a.tar.gz
dfhack-8527547cbe050cb0b5e50c162354f1eb069a554a.tar.bz2
dfhack-8527547cbe050cb0b5e50c162354f1eb069a554a.tar.xz
Merge branch 'master' into purge
Conflicts: library/DataDefs.cpp
Diffstat (limited to 'library/DataDefs.cpp')
-rw-r--r--library/DataDefs.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp
index 86c3ea02..77b15920 100644
--- a/library/DataDefs.cpp
+++ b/library/DataDefs.cpp
@@ -208,22 +208,3 @@ int DFHack::findBitfieldField(const std::string &name, int size, const bitfield_
return -1;
}
-
-#define SIMPLE_GLOBAL(name,tname) \
- tname *df::global::name = NULL;
-#define GLOBAL(name,tname) SIMPLE_GLOBAL(name,df::tname)
-DF_KNOWN_GLOBALS
-#undef GLOBAL
-#undef SIMPLE_GLOBAL
-
-void DFHack::InitDataDefGlobals(Core *core) {
- VersionInfo *vinfo = core->vinfo;
- void * tmp;
-
-#define SIMPLE_GLOBAL(name,tname) \
- if (vinfo->getAddress(#name,tmp)) df::global::name = (tname*)tmp;
-#define GLOBAL(name,tname) SIMPLE_GLOBAL(name,df::tname)
-DF_KNOWN_GLOBALS
-#undef GLOBAL
-#undef SIMPLE_GLOBAL
-}