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

Core/DataStores: Fixed loading int arrays from trailing packed blobs in db2 files

Browse Source 
Closes #18072
This commit is contained in:
Shauren
2016-10-15 23:53:28 +02:00
parent 6a87e266eb
commit 4a0f5ed2be
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/shared/DataStores/DB2StorageLoader.cpp
View File

@@ -184,7 +184,7 @@ uint16 DB2FileLoaderRegularImpl::Record::GetByteSize(uint32 field) const
uint32 DB2FileLoaderRegularImpl::Record::GetVarInt(uint32 field, uint32 arrayIndex, bool isSigned) const
{
ASSERT(field < file._header->FieldCount);
uint32 val = *reinterpret_cast<uint32*>(offset + GetOffset(field) + arrayIndex * sizeof(uint32));
uint32 val = *reinterpret_cast<uint32*>(offset + GetOffset(field) + arrayIndex * (4 - file.fields[field].UnusedBits / 8));
EndianConvert(val);
if (isSigned)
return int32(val) << file.fields[field].UnusedBits >> file.fields[field].UnusedBits;
@@ -332,7 +332,7 @@ char* DB2FileLoaderRegularImpl::AutoProduceData(uint32& records, char**& indexTa
for (uint32 y = 0; y < _header->RecordCount; y++)
{
Record rec = getRecord(y);
uint32 indexVal = _loadInfo.Meta->HasIndexFieldInData() ? rec.getUInt(indexField, 0, _loadInfo.Fields[0].IsSigned) : ((uint32*)idTable)[y];
uint32 indexVal = _loadInfo.Meta->HasIndexFieldInData() ? rec.getUInt(indexField, 0, false) : ((uint32*)idTable)[y];
indexTable[indexVal] = &dataTable[offset];