Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings and nopch build

Browse Source
This commit is contained in:
Shauren
2019-06-08 17:57:58 +02:00
parent 3bf084c70e
commit 101f82855e
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/DataStores/DB2FileLoader.cpp
View File

@@ -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;

7
src/server/game/Entities/Object/Updates/UpdateField.h
View File

@@ -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)

2
src/tools/vmap4_extractor/vmapexport.cpp
View File

@@ -42,8 +42,6 @@
#ifdef WIN32
#include <direct.h>
#define mkdir _mkdir
#else
#define ERROR_PATH_NOT_FOUND ERROR_FILE_NOT_FOUND
#endif
//------------------------------------------------------------------------------

4
src/tools/vmap4_extractor/wmo.cpp
View File

@@ -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])