aboutsummaryrefslogtreecommitdiff
path: root/src
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
parent3bf084c70eaf6ec2f0b7bed2467cbbe3a75f50cc (diff)
Fix warnings and nopch build
Diffstat (limited to 'src')
-rw-r--r--src/common/DataStores/DB2FileLoader.cpp2
-rw-r--r--src/server/game/Entities/Object/Updates/UpdateField.h7
-rw-r--r--src/tools/vmap4_extractor/vmapexport.cpp2
-rw-r--r--src/tools/vmap4_extractor/wmo.cpp4
4 files changed, 6 insertions, 9 deletions
diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp
index 76aad009683..172dd6c19fa 100644
--- a/src/common/DataStores/DB2FileLoader.cpp
+++ b/src/common/DataStores/DB2FileLoader.cpp
@@ -262,7 +262,7 @@ public:
std::unique_ptr<std::unique_ptr<DB2PalletValue[]>[]> palletValues, std::unique_ptr<std::unique_ptr<DB2PalletValue[]>[]> palletArrayValues,
std::unique_ptr<std::unordered_map<uint32, uint32>[]> commonValues) override;
void SkipEncryptedSection(uint32 section) override;
- bool LoadTableData(DB2FileSource* source, uint32 section) override { return true; }
+ bool LoadTableData(DB2FileSource* /*source*/, uint32 /*section*/) override { return true; }
bool LoadCatalogData(DB2FileSource* source, uint32 section) override;
void SetAdditionalData(std::vector<uint32> /*idTable*/, std::vector<DB2RecordCopy> /*copyTable*/, std::vector<DB2IndexData> /*parentIndexes*/) override;
char* AutoProduceData(uint32& records, char**& indexTable, std::vector<char*>& stringPool) override;
diff --git a/src/server/game/Entities/Object/Updates/UpdateField.h b/src/server/game/Entities/Object/Updates/UpdateField.h
index 99a0cce9d8d..635b98a8e1a 100644
--- a/src/server/game/Entities/Object/Updates/UpdateField.h
+++ b/src/server/game/Entities/Object/Updates/UpdateField.h
@@ -20,6 +20,7 @@
#include "ObjectGuid.h"
#include "UpdateMask.h"
+#include <algorithm>
#include <vector>
class ByteBuffer;
@@ -369,7 +370,7 @@ namespace UF
}
template<typename T, uint32 BlockBit, uint32 Bit>
- void ClearChangesMask(UpdateField<T, BlockBit, Bit>& field, std::false_type) { }
+ void ClearChangesMask(UpdateField<T, BlockBit, Bit>&, std::false_type) { }
template<typename T, uint32 BlockBit, uint32 Bit>
void ClearChangesMask(UpdateField<T, BlockBit, Bit>& field, std::true_type)
@@ -384,7 +385,7 @@ namespace UF
}
template<typename T, std::size_t Size, uint32 Bit, uint32 FirstElementBit>
- void ClearChangesMask(UpdateFieldArray<T, Size, Bit, FirstElementBit>& field, std::false_type) { }
+ void ClearChangesMask(UpdateFieldArray<T, Size, Bit, FirstElementBit>&, std::false_type) { }
template<typename T, std::size_t Size, uint32 Bit, uint32 FirstElementBit>
void ClearChangesMask(UpdateFieldArray<T, Size, Bit, FirstElementBit>& field, std::true_type)
@@ -401,7 +402,7 @@ namespace UF
}
template<typename T, uint32 BlockBit, uint32 Bit>
- void ClearChangesMask(DynamicUpdateField<T, BlockBit, Bit>& field, std::false_type) { }
+ void ClearChangesMask(DynamicUpdateField<T, BlockBit, Bit>&, std::false_type) { }
template<typename T, uint32 BlockBit, uint32 Bit>
void ClearChangesMask(DynamicUpdateField<T, BlockBit, Bit>& field, std::true_type)
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])