summaryrefslogtreecommitdiff
path: root/library/VersionInfoFactory.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-07-14 04:05:27 +0200
committerPetr Mrázek2011-07-14 04:05:27 +0200
commit792d272fbf3a1a80d597757300b9a33ea083bcc2 (patch)
tree9db1134457cb6a980ab8081e64bacd61aebafdcd /library/VersionInfoFactory.cpp
parent630b746cfe8455ee89ef8af55013141aa70ccf87 (diff)
downloaddfhack-792d272fbf3a1a80d597757300b9a33ea083bcc2.tar.gz
dfhack-792d272fbf3a1a80d597757300b9a33ea083bcc2.tar.bz2
dfhack-792d272fbf3a1a80d597757300b9a33ea083bcc2.tar.xz
Windows side of the Console rewrite
Diffstat (limited to 'library/VersionInfoFactory.cpp')
-rw-r--r--library/VersionInfoFactory.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp
index 3e676ece..15f3f8a6 100644
--- a/library/VersionInfoFactory.cpp
+++ b/library/VersionInfoFactory.cpp
@@ -168,13 +168,13 @@ void VersionInfoFactory::ParseVTable(TiXmlElement* vtable, VersionInfo* mem)
string type = pClassEntry->Value();
const char *cstr_name = pClassEntry->Attribute("name");
const char *cstr_vtable = pClassEntry->Attribute("vtable");
- uint32_t vtable = 0;
+ uint32_t vtable_num = 0;
if(cstr_vtable)
- vtable = strtol(cstr_vtable, NULL, 16);
+ vtable_num = strtol(cstr_vtable, NULL, 16);
// it's a simple class
if(type== "class")
{
- mem->setClass(cstr_name, vtable);
+ mem->setClass(cstr_name, vtable_num);
}
// it's a multi-type class
else if (type == "multiclass")
@@ -184,7 +184,7 @@ void VersionInfoFactory::ParseVTable(TiXmlElement* vtable, VersionInfo* mem)
uint32_t typeoffset = 0;
if(cstr_typeoffset)
typeoffset = strtol(cstr_typeoffset, NULL, 16);
- t_class * mclass = mem->setClass(cstr_name, vtable, typeoffset);
+ t_class * mclass = mem->setClass(cstr_name, vtable_num, typeoffset);
// parse class sub-entries
pClassSubEntry = pClassEntry->FirstChildElement();
for(;pClassSubEntry;pClassSubEntry=pClassSubEntry->NextSiblingElement())