diff options
Diffstat (limited to 'src/common/DataStores')
| -rw-r--r-- | src/common/DataStores/DBCFileLoader.cpp | 2 | ||||
| -rw-r--r-- | src/common/DataStores/DBCFileLoader.h | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp index a2ace0eb41b..d38ba107014 100644 --- a/src/common/DataStores/DBCFileLoader.cpp +++ b/src/common/DataStores/DBCFileLoader.cpp @@ -88,7 +88,7 @@ bool DBCFileLoader::Load(char const* filename, char const* fmt) for (uint32 i = 1; i < fieldCount; ++i) { fieldsOffset[i] = fieldsOffset[i - 1]; - if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X') // byte fields + if (fmt[i - 1] == FT_BYTE || fmt[i - 1] == FT_NA_BYTE) // byte fields fieldsOffset[i] += sizeof(uint8); else // 4 byte fields (int32/float/strings) fieldsOffset[i] += sizeof(uint32); diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h index 0abbf6c95eb..40585853490 100644 --- a/src/common/DataStores/DBCFileLoader.h +++ b/src/common/DataStores/DBCFileLoader.h @@ -24,17 +24,17 @@ enum DbcFieldFormat { - FT_NA='x', //not used or unknown, 4 byte size - FT_NA_BYTE='X', //not used or unknown, byte - FT_STRING='s', //char* - FT_FLOAT='f', //float - FT_INT='i', //uint32 - FT_BYTE='b', //uint8 - FT_SORT='d', //sorted by this field, field is not included - FT_IND='n', //the same, but parsed to data - FT_LOGIC='l', //Logical (boolean) - FT_SQL_PRESENT='p', //Used in sql format to mark column present in sql dbc - FT_SQL_ABSENT='a' //Used in sql format to mark column absent in sql dbc + FT_NA = 'x', //not used or unknown, 4 byte size + FT_NA_BYTE = 'X', //not used or unknown, byte + FT_STRING = 's', //char* + FT_FLOAT = 'f', //float + FT_INT = 'i', //uint32 + FT_BYTE = 'b', //uint8 + FT_SORT = 'd', //sorted by this field, field is not included + FT_IND = 'n', //the same, but parsed to data + FT_LOGIC = 'l', //Logical (boolean) + FT_SQL_PRESENT = 'p', //Used in sql format to mark column present in sql dbc + FT_SQL_ABSENT = 'a' //Used in sql format to mark column absent in sql dbc }; class TC_COMMON_API DBCFileLoader @@ -51,21 +51,21 @@ class TC_COMMON_API DBCFileLoader float getFloat(size_t field) const { ASSERT(field < file.fieldCount); - float val = *reinterpret_cast<float*>(offset+file.GetOffset(field)); + float val = *reinterpret_cast<float*>(offset + file.GetOffset(field)); EndianConvert(val); return val; } uint32 getUInt(size_t field) const { ASSERT(field < file.fieldCount); - uint32 val = *reinterpret_cast<uint32*>(offset+file.GetOffset(field)); + uint32 val = *reinterpret_cast<uint32*>(offset + file.GetOffset(field)); EndianConvert(val); return val; } uint8 getUInt8(size_t field) const { ASSERT(field < file.fieldCount); - return *reinterpret_cast<uint8*>(offset+file.GetOffset(field)); + return *reinterpret_cast<uint8*>(offset + file.GetOffset(field)); } const char *getString(size_t field) const @@ -78,8 +78,8 @@ class TC_COMMON_API DBCFileLoader private: Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) { } - unsigned char *offset; - DBCFileLoader &file; + unsigned char* offset; + DBCFileLoader& file; friend class DBCFileLoader; |