From 5f1977cb1d690d2e60a1f5355244ec472e014278 Mon Sep 17 00:00:00 2001 From: Nay Date: Thu, 30 Aug 2012 19:07:59 +0100 Subject: Core: Fix many "errors"/warnings and coding style (1) Extractors, worldserver, authserver, shared and collision affected Errors were found using Cppcheck, open-source static analysis tool --- src/tools/map_extractor/System.cpp | 6 +++--- src/tools/map_extractor/dbcfile.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/tools/map_extractor') diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index d64276c6363..f474925313e 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -900,7 +900,7 @@ void ExtractMapsFromMpq(uint32 build) printf("Convert map files\n"); for(uint32 z = 0; z < map_count; ++z) { - printf("Extract %s (%d/%d) \n", map_ids[z].name, z+1, map_count); + printf("Extract %s (%d/%u) \n", map_ids[z].name, z+1, map_count); // Loadup map grid data sprintf(mpq_map_name, "World\\Maps\\%s\\%s.wdt", map_ids[z].name, map_ids[z].name); WDT_file wdt; @@ -980,13 +980,13 @@ void ExtractDBCFiles(int locale, bool basicLocale) } // extract DBCs - int count = 0; + uint32 count = 0; for (set::iterator iter = dbcfiles.begin(); iter != dbcfiles.end(); ++iter) { string filename = path; filename += (iter->c_str() + strlen("DBFilesClient\\")); - if(ExtractFile(iter->c_str(), filename)) + if (ExtractFile(iter->c_str(), filename)) ++count; } printf("Extracted %u DBC files\n\n", count); diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp index 927d3d62b7f..c1cab7ddb2f 100644 --- a/src/tools/map_extractor/dbcfile.cpp +++ b/src/tools/map_extractor/dbcfile.cpp @@ -3,12 +3,12 @@ #include "dbcfile.h" #include "mpq_libmpq04.h" -DBCFile::DBCFile(const std::string &filename): - filename(filename), - data(0) +DBCFile::DBCFile(const std::string& filename): + filename(filename), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(NULL), stringTable(NULL) { } + bool DBCFile::open() { MPQFile f(filename.c_str()); -- cgit v1.2.3