aboutsummaryrefslogtreecommitdiff
path: root/src/tools/vmap4_extractor
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-06-08 17:57:58 +0200
committerShauren <shauren.trinity@gmail.com>2019-06-08 17:57:58 +0200
commit101f82855ebc7369d295eb7df8b98aeacdae9628 (patch)
tree69f72ebd3836571eecc3904c34f89e03603eb27e /src/tools/vmap4_extractor
parent3bf084c70eaf6ec2f0b7bed2467cbbe3a75f50cc (diff)
Fix warnings and nopch build
Diffstat (limited to 'src/tools/vmap4_extractor')
-rw-r--r--src/tools/vmap4_extractor/vmapexport.cpp2
-rw-r--r--src/tools/vmap4_extractor/wmo.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 25b42e8ed07..7c4c5220259 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -42,8 +42,6 @@
#ifdef WIN32
#include <direct.h>
#define mkdir _mkdir
-#else
- #define ERROR_PATH_NOT_FOUND ERROR_FILE_NOT_FOUND
#endif
//------------------------------------------------------------------------------
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index 56e3fa6faec..c0d09bebe5a 100644
--- a/src/tools/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
@@ -109,11 +109,9 @@ bool WMORoot::open()
{
ASSERT(!DoodadData.Paths);
- char* ptr = f.getPointer();
- char* end = ptr + size;
uint32 fileDataIdCount = size / sizeof(uint32);
DoodadData.FileDataIds = std::make_unique<uint32[]>(fileDataIdCount);
- memcpy(DoodadData.FileDataIds.get(), ptr, size);
+ f.read(DoodadData.FileDataIds.get(), size);
for (uint32 i = 0; i < fileDataIdCount; ++i)
{
if (!DoodadData.FileDataIds[i])