summaryrefslogtreecommitdiff
path: root/library/DataDefs.cpp
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-01-01 23:05:45 +0400
committerAlexander Gavrilov2012-01-01 23:05:45 +0400
commit6476d61e59e7b49a2e0afb2cac3e19768573cb0e (patch)
tree1294f3130ae953ca0a36906ed6b2b1c21064a44d /library/DataDefs.cpp
parent3f9e1b0c2b6036623e88d44a4d108b560c26d441 (diff)
downloaddfhack-6476d61e59e7b49a2e0afb2cac3e19768573cb0e.tar.gz
dfhack-6476d61e59e7b49a2e0afb2cac3e19768573cb0e.tar.bz2
dfhack-6476d61e59e7b49a2e0afb2cac3e19768573cb0e.tar.xz
Update structure definitions & add the fixwagons plugin from Q.
Diffstat (limited to 'library/DataDefs.cpp')
-rw-r--r--library/DataDefs.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp
index 772b3393..bcdb388b 100644
--- a/library/DataDefs.cpp
+++ b/library/DataDefs.cpp
@@ -160,17 +160,21 @@ void virtual_identity::Init(Core *core)
}
}
-#define GLOBAL(name,tname) \
- df::tname *df::global::name = NULL;
+#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) {
OffsetGroup *global_table = core->vinfo->getGroup("global");
uint32_t tmp;
-#define GLOBAL(name,tname) \
- if (global_table->getSafeAddress(#name,tmp)) df::global::name = (df::tname*)tmp;
+#define SIMPLE_GLOBAL(name,tname) \
+ if (global_table->getSafeAddress(#name,tmp)) df::global::name = (tname*)tmp;
+#define GLOBAL(name,tname) SIMPLE_GLOBAL(name,df::tname)
DF_KNOWN_GLOBALS
#undef GLOBAL
+#undef SIMPLE_GLOBAL
}