mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11248] Clarify and check DBC/SQL storage format field types.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Vinolentus 2011-03-15 02:53:59 +03:00 • committed by VladimirMangos
parent 189e7c08b7
commit a6bab82c72
4 changed files with 186 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

107
src/shared/Database/DBCFileLoader.cpp
View file

@ -107,29 +107,42 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
{
uint32 recordsize = 0;
int32 i = -1;
for(uint32 x=0; format[x];++x)
for(uint32 x = 0; format[x]; ++ x)
{
switch(format[x])
{
case FT_FLOAT:
recordsize += sizeof(float);
break;
case FT_INT:
recordsize+=4;
recordsize += sizeof(uint32);
break;
case FT_STRING:
recordsize+=sizeof(char*);
recordsize += sizeof(char*);
break;
case FT_SORT:
i=x;
break;
case FT_IND:
i=x;
recordsize+=4;
recordsize += sizeof(uint32);
break;
case FT_BYTE:
recordsize += 1;
recordsize += sizeof(uint8);
break;
case FT_LOGIC:
assert(false && "DBC files not have logic field type");
break;
case FT_NA:
case FT_NA_BYTE:
break;
default:
assert(false && "unknown format character");
break;
}
}
if(index_pos)
if (index_pos)
*index_pos = i;
return recordsize;
@ -181,35 +194,45 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
uint32 offset=0;
for(uint32 y =0;y<recordCount;y++)
for(uint32 y =0; y < recordCount; ++y)
{
if(i>=0)
if (i >= 0)
{
indexTable[getRecord(y).getUInt(i)]=&dataTable[offset];
}
else
indexTable[y]=&dataTable[offset];
for(uint32 x=0;x<fieldCount;x++)
for(uint32 x = 0; x < fieldCount; ++x)
{
switch(format[x])
{
case FT_FLOAT:
*((float*)(&dataTable[offset]))=getRecord(y).getFloat(x);
offset+=4;
offset += sizeof(float);
break;
case FT_IND:
case FT_INT:
*((uint32*)(&dataTable[offset]))=getRecord(y).getUInt(x);
offset+=4;
offset += sizeof(uint32);
break;
case FT_BYTE:
*((uint8*)(&dataTable[offset]))=getRecord(y).getUInt8(x);
offset+=1;
offset += sizeof(uint8);
break;
case FT_STRING:
*((char**)(&dataTable[offset]))=NULL; // will be replaces non-empty or "" strings in AutoProduceStrings
offset+=sizeof(char*);
offset += sizeof(char*);
break;
case FT_LOGIC:
assert(false && "DBC files not have logic field type");
break;
case FT_NA:
case FT_NA_BYTE:
case FT_SORT:
break;
default:
assert(false && "unknown format character");
break;
}
}
@ -228,37 +251,45 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
uint32 offset=0;
for(uint32 y =0;y<recordCount;y++)
for(uint32 y =0; y < recordCount; ++y)
{
for(uint32 x=0;x<fieldCount;x++)
switch(format[x])
for(uint32 x = 0; x < fieldCount; ++x)
{
case FT_FLOAT:
case FT_IND:
case FT_INT:
offset+=4;
break;
case FT_BYTE:
offset+=1;
break;
case FT_STRING:
switch(format[x])
{
// fill only not filled entries
char** slot = (char**)(&dataTable[offset]);
if(!*slot || !**slot)
case FT_FLOAT:
offset += sizeof(float);
break;
case FT_IND:
case FT_INT:
offset += sizeof(uint32);
break;
case FT_BYTE:
offset += sizeof(uint8);
break;
case FT_STRING:
{
const char * st = getRecord(y).getString(x);
*slot=stringPool+(st-(const char*)stringTable);
// fill only not filled entries
char** slot = (char**)(&dataTable[offset]);
if(!*slot || !**slot)
{
const char * st = getRecord(y).getString(x);
*slot=stringPool+(st-(const char*)stringTable);
}
offset += sizeof(char*);
break;
}
offset+=sizeof(char*);
break;
case FT_LOGIC:
assert(false && "DBC files not have logic field type");
break;
case FT_NA:
case FT_NA_BYTE:
case FT_SORT:
break;
default:
assert(false && "unknown format character");
break;
}
case FT_NA:
case FT_NA_BYTE:
case FT_SORT:
break;
default:
assert(false && "unknown format character");
}
}