diff options
| author | Petr Mrázek | 2012-02-11 18:48:17 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-02-11 18:48:17 +0100 |
| commit | 8527547cbe050cb0b5e50c162354f1eb069a554a (patch) | |
| tree | 19165341f455a79f01745e1bcd2c70b7e8183058 /library/DataDefs.cpp | |
| parent | aee5efe7c0d0cdf784fb8bdb445cc233435d47dd (diff) | |
| parent | f469fab1e6e419ff26655bc3fe9868653dc0f0f0 (diff) | |
| download | dfhack-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.cpp | 19 |
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 -} |
