diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-22 18:41:26 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-22 18:41:26 +0000 |
| commit | bd893b4516292de4d2b1244acbecb0f301977e3f (patch) | |
| tree | da894b02db1e4c94b00316dba0ce88700b615f9b | |
| parent | 69baba23cc81bef23278549c93576afc3195ece5 (diff) | |
Tools/MeshExtractor: Fix warnings
| -rw-r--r-- | src/tools/mesh_extractor/MPQManager.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mesh_extractor/MPQManager.h | 4 | ||||
| -rw-r--r-- | src/tools/mesh_extractor/WorldModelGroup.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp index 5ae8558d749..91b9c121c89 100644 --- a/src/tools/mesh_extractor/MPQManager.cpp +++ b/src/tools/mesh_extractor/MPQManager.cpp @@ -4,7 +4,7 @@ #include "Utils.h" #include <ace/Guard_T.h> -char* MPQManager::Files[] = { +char const* MPQManager::Files[] = { "common.MPQ", "common-2.MPQ", "expansion.MPQ", diff --git a/src/tools/mesh_extractor/MPQManager.h b/src/tools/mesh_extractor/MPQManager.h index 788be7f5974..2f49ad258a5 100644 --- a/src/tools/mesh_extractor/MPQManager.h +++ b/src/tools/mesh_extractor/MPQManager.h @@ -24,8 +24,8 @@ public: std::set<uint32> AvailableLocales; std::map<uint32, MPQArchive*> LocaleFiles; - static char* Files[]; - static char* Languages[]; + static char const* Files[]; + static char const* Languages[]; protected: void InitializeDBC(); private: diff --git a/src/tools/mesh_extractor/WorldModelGroup.cpp b/src/tools/mesh_extractor/WorldModelGroup.cpp index 5eeef824b1a..21e1c1e63e1 100644 --- a/src/tools/mesh_extractor/WorldModelGroup.cpp +++ b/src/tools/mesh_extractor/WorldModelGroup.cpp @@ -137,7 +137,7 @@ void WorldModelGroup::ReadBatches() MOBALength = chunk->Length / 2; MOBA = new uint16[MOBALength]; - int count = fread(MOBA, sizeof(uint16), MOBALength, chunk->GetStream()); + uint32 count = (uint32)fread(MOBA, sizeof(uint16), MOBALength, chunk->GetStream()); if (count != MOBALength) - printf("WorldModelGroup::ReadBatches: Error reading data, expected %d, read %d\n", MOBALength, count); + printf("WorldModelGroup::ReadBatches: Error reading data, expected %u, read %u\n", MOBALength, count); } |