diff options
| author | Petr Mrázek | 2010-08-28 04:39:03 +0200 |
|---|---|---|
| committer | Petr Mrázek | 2010-08-28 04:39:03 +0200 |
| commit | e762f1caeaead912c4eb6a61f9453cb0f8d00676 (patch) | |
| tree | 8a81b8bae3548bb5053d1ea21b53e7f7ae496117 /library/VersionInfoFactory.cpp | |
| parent | f2dea86819253a5b86a4eb4c82101462b903e62d (diff) | |
| parent | 9cf2e0f26d780b49621e9b478576e1a2e2ce0a09 (diff) | |
| download | dfhack-e762f1caeaead912c4eb6a61f9453cb0f8d00676.tar.gz dfhack-e762f1caeaead912c4eb6a61f9453cb0f8d00676.tar.bz2 dfhack-e762f1caeaead912c4eb6a61f9453cb0f8d00676.tar.xz | |
Merge branch 'master' of git://bigbox.banquise.net/dfhack
Conflicts:
tools/examples/creaturedump.cpp
tools/supported/dumpoffsets.cpp
Diffstat (limited to 'library/VersionInfoFactory.cpp')
| -rw-r--r-- | library/VersionInfoFactory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp index 14076426..6a1bd517 100644 --- a/library/VersionInfoFactory.cpp +++ b/library/VersionInfoFactory.cpp @@ -118,7 +118,7 @@ void VersionInfoFactory::ParseOffsets(TiXmlElement * parent, VersionInfo* target // work variables OffsetGroup * currentGroup = 0; TiXmlElement * currentElem = 0; - cerr << "<Offsets>"<< endl; + //cerr << "<Offsets>"<< endl; while(1) { // get current work variables @@ -137,7 +137,7 @@ void VersionInfoFactory::ParseOffsets(TiXmlElement * parent, VersionInfo* target } else { - cerr << "</group>" << endl; + //cerr << "</group>" << endl; continue; } } @@ -178,10 +178,10 @@ void VersionInfoFactory::ParseOffsets(TiXmlElement * parent, VersionInfo* target og = currentGroup->createGroup(cstr_name); else og = currentGroup->getGroup(cstr_name); - cerr << "<group name=\"" << cstr_name << "\">" << endl; + //cerr << "<group name=\"" << cstr_name << "\">" << endl; // advance this level to the next element groupPair & gp = breadcrumbs.back(); - gp.first = gp.first->NextSiblingElement(); + gp.first = currentElem->NextSiblingElement(); // add a new level that will be processed next breadcrumbs.push_back(groupPair(currentElem->FirstChildElement(), og)); @@ -250,10 +250,10 @@ void VersionInfoFactory::ParseOffsets(TiXmlElement * parent, VersionInfo* target // advance to next element groupPair & gp = breadcrumbs.back(); - gp.first = gp.first->NextSiblingElement(); + gp.first = currentElem->NextSiblingElement(); continue; } - cerr << "</Offsets>"<< endl; + //cerr << "</Offsets>"<< endl; } void VersionInfoFactory::ParseBase (TiXmlElement* entry, VersionInfo* mem) |
