diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/mesh_extractor/ContinentBuilder.h | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/MPQManager.cpp | 1 | ||||
-rw-r--r-- | src/tools/mesh_extractor/ObjectDataHandler.h | 1 | ||||
-rw-r--r-- | src/tools/mesh_extractor/Stream.h | 6 | ||||
-rw-r--r-- | src/tools/mesh_extractor/TileBuilder.cpp | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/Utils.cpp | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/WDT.cpp | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/WorldModelGroup.cpp | 4 |
8 files changed, 13 insertions, 7 deletions
diff --git a/src/tools/mesh_extractor/ContinentBuilder.h b/src/tools/mesh_extractor/ContinentBuilder.h index ce1eef9b642..8ecad9d9722 100644 --- a/src/tools/mesh_extractor/ContinentBuilder.h +++ b/src/tools/mesh_extractor/ContinentBuilder.h @@ -54,7 +54,7 @@ private: class TileBuildRequest : public ACE_Method_Request { public: - TileBuildRequest(ContinentBuilder* builder, std::string& continent, uint32 x, uint32 y, uint32 mapId, dtNavMeshParams& params) : _builder(builder), _continent(continent), X(x), Y(y), _mapId(mapId), _params(params) { } + TileBuildRequest(ContinentBuilder* builder, std::string& continent, uint32 x, uint32 y, uint32 mapId, dtNavMeshParams& params) : _mapId(mapId), _builder(builder), _continent(continent), X(x), Y(y), _params(params) { } virtual int call(); diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp index 82e4a2b5bff..987e53eb340 100644 --- a/src/tools/mesh_extractor/MPQManager.cpp +++ b/src/tools/mesh_extractor/MPQManager.cpp @@ -56,7 +56,6 @@ void MPQManager::InitializeDBC() { BaseLocale = -1; uint32 size = sizeof(Languages) / sizeof(char*); - MPQArchive* _baseLocale = NULL; for (uint32 i = 0; i < size; ++i) { std::string _fileName = "Data/" + std::string(Languages[i]) + "/locale-" + std::string(Languages[i]) + ".MPQ"; diff --git a/src/tools/mesh_extractor/ObjectDataHandler.h b/src/tools/mesh_extractor/ObjectDataHandler.h index 3b18427db47..346241f9ae0 100644 --- a/src/tools/mesh_extractor/ObjectDataHandler.h +++ b/src/tools/mesh_extractor/ObjectDataHandler.h @@ -24,6 +24,7 @@ class ObjectDataHandler { public: ObjectDataHandler(ADT* _adt) : Source(_adt) {} + virtual ~ObjectDataHandler() {} void ProcessMapChunk(MapChunk* chunk); virtual void ProcessInternal(MapChunk* data) = 0; diff --git a/src/tools/mesh_extractor/Stream.h b/src/tools/mesh_extractor/Stream.h index 76d9511bbc4..9aaeba3369c 100644 --- a/src/tools/mesh_extractor/Stream.h +++ b/src/tools/mesh_extractor/Stream.h @@ -25,6 +25,12 @@ public: _position += size; } + template<typename T> + void Skip() + { + _position += sizeof(T); + } + char* Read(uint32 size); std::string ReadString(); diff --git a/src/tools/mesh_extractor/TileBuilder.cpp b/src/tools/mesh_extractor/TileBuilder.cpp index f9563485c8b..e5c274380e9 100644 --- a/src/tools/mesh_extractor/TileBuilder.cpp +++ b/src/tools/mesh_extractor/TileBuilder.cpp @@ -91,7 +91,7 @@ void TileBuilder::AddGeometry(WorldModelRoot* root, const WorldModelDefinition& OutputDebugVertices(); } -uint8* TileBuilder::BuildInstance( dtNavMeshParams& navMeshParams ) +uint8* TileBuilder::BuildInstance( dtNavMeshParams& /*navMeshParams*/ ) { float* bmin = NULL, *bmax = NULL; diff --git a/src/tools/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp index 937de4b443a..5395fb1c92b 100644 --- a/src/tools/mesh_extractor/Utils.cpp +++ b/src/tools/mesh_extractor/Utils.cpp @@ -92,7 +92,7 @@ Vector3 Utils::TransformDoodadVertex(const IDefinition& def, Vector3 vec, bool t return ret; } -Vector3 Utils::TransformWmoDoodad(const DoodadInstance& inst, const WorldModelDefinition& root, Vector3& vec, bool translate ) +Vector3 Utils::TransformWmoDoodad(const DoodadInstance& inst, const WorldModelDefinition& /*root*/, Vector3& vec, bool translate ) { G3D::Quat quat = G3D::Quat(-inst.QuatY, inst.QuatZ, -inst.QuatX, inst.QuatW); diff --git a/src/tools/mesh_extractor/WDT.cpp b/src/tools/mesh_extractor/WDT.cpp index b22e9ff136b..ef554d7606f 100644 --- a/src/tools/mesh_extractor/WDT.cpp +++ b/src/tools/mesh_extractor/WDT.cpp @@ -55,7 +55,7 @@ void WDT::ReadTileTable() { const uint32 hasTileFlag = 0x1; uint32 flags = stream->Read<uint32>(); - uint32 discard = stream->Read<uint32>(); + stream->Skip<uint32>(); if (flags & hasTileFlag) TileTable.push_back(TilePos(x, y)); diff --git a/src/tools/mesh_extractor/WorldModelGroup.cpp b/src/tools/mesh_extractor/WorldModelGroup.cpp index 454756f2baf..57d1126a239 100644 --- a/src/tools/mesh_extractor/WorldModelGroup.cpp +++ b/src/tools/mesh_extractor/WorldModelGroup.cpp @@ -20,7 +20,7 @@ #include "Chunk.h" #include "Utils.h" -WorldModelGroup::WorldModelGroup(std::string path, int groupIndex) : SubData(NULL), GroupIndex(groupIndex), MOBA(NULL), MOBALength(0), IsBad(false), HasLiquidData(false) +WorldModelGroup::WorldModelGroup(std::string path, int groupIndex) : SubData(NULL), GroupIndex(groupIndex), MOBA(NULL), MOBALength(0), HasLiquidData(false), IsBad(false) { Data = new ChunkedData(path); if (!Data->_Stream) @@ -31,7 +31,7 @@ WorldModelGroup::WorldModelGroup(std::string path, int groupIndex) : SubData(NUL Load(path); } -WorldModelGroup::WorldModelGroup(Stream* stream, std::string path, int groupIndex) : SubData(NULL), GroupIndex(groupIndex), MOBA(NULL), MOBALength(0), IsBad(false), HasLiquidData(false) +WorldModelGroup::WorldModelGroup(Stream* stream, std::string path, int groupIndex) : SubData(NULL), GroupIndex(groupIndex), MOBA(NULL), MOBALength(0), HasLiquidData(false), IsBad(false) { Data = new ChunkedData(stream, stream->GetSize()); Load(path); |