summaryrefslogtreecommitdiff
path: root/library/DataDefs.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-01-04 01:45:11 +0100
committerPetr Mrázek2012-01-04 01:45:11 +0100
commit86464b99cca06f9e3cf7dd05c6441136c6ab442f (patch)
treeba1f42f1c9c799f6f7470fa498b7637c02a0d401 /library/DataDefs.cpp
parent5b528694b716cbd9ba156bd875c5a8e40e7e1759 (diff)
downloaddfhack-86464b99cca06f9e3cf7dd05c6441136c6ab442f.tar.gz
dfhack-86464b99cca06f9e3cf7dd05c6441136c6ab442f.tar.bz2
dfhack-86464b99cca06f9e3cf7dd05c6441136c6ab442f.tar.xz
Remove DfVector, break MSVC builds until further notice.
Diffstat (limited to 'library/DataDefs.cpp')
-rw-r--r--library/DataDefs.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp
index bcdb388b..312252b4 100644
--- a/library/DataDefs.cpp
+++ b/library/DataDefs.cpp
@@ -154,9 +154,9 @@ void virtual_identity::Init(Core *core)
// Read pre-filled vtable ptrs
OffsetGroup *ptr_table = core->vinfo->getGroup("vtable");
for (virtual_identity *p = list; p; p = p->next) {
- uint32_t tmp;
+ void * tmp;
if (ptr_table->getSafeAddress(p->getName(),tmp))
- p->vtable_ptr = (void*)tmp;
+ p->vtable_ptr = tmp;
}
}
@@ -169,7 +169,7 @@ DF_KNOWN_GLOBALS
void DFHack::InitDataDefGlobals(Core *core) {
OffsetGroup *global_table = core->vinfo->getGroup("global");
- uint32_t tmp;
+ void * tmp;
#define SIMPLE_GLOBAL(name,tname) \
if (global_table->getSafeAddress(#name,tmp)) df::global::name = (tname*)tmp;