diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/shared/DataStores/DB2DatabaseLoader.cpp | 13 | ||||
| -rw-r--r-- | src/server/shared/DataStores/DB2DatabaseLoader.h | 3 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/server/shared/DataStores/DB2DatabaseLoader.cpp b/src/server/shared/DataStores/DB2DatabaseLoader.cpp index cd081dafaae..0435ba939c3 100644 --- a/src/server/shared/DataStores/DB2DatabaseLoader.cpp +++ b/src/server/shared/DataStores/DB2DatabaseLoader.cpp @@ -23,11 +23,6 @@ #include "Log.h" #include <cstring> -DB2LoadInfo::DB2LoadInfo(DB2FieldMeta const* fields, std::size_t fieldCount, DB2Meta const* meta, HotfixDatabaseStatements statement) - : DB2FileLoadInfo(fields, fieldCount, meta), Statement(statement) -{ -} - static char const* nullStr = ""; char* DB2DatabaseLoader::Load(bool custom, uint32& records, char**& indexTable, std::vector<char*>& stringPool) @@ -102,7 +97,7 @@ char* DB2DatabaseLoader::Load(bool custom, uint32& records, char**& indexTable, { for (uint32 z = 0; z < _loadInfo->Meta->Fields[x].ArraySize; ++z) { - switch (_loadInfo->TypesString[f]) + switch (_loadInfo->Fields[f].Type) { case FT_FLOAT: *((float*)(&dataValue[offset])) = fields[f].GetFloat(); @@ -153,7 +148,7 @@ char* DB2DatabaseLoader::Load(bool custom, uint32& records, char**& indexTable, } default: ABORT_MSG("Unknown format character '%c' found in %s meta for field %s", - _loadInfo->TypesString[f], _storageName.c_str(), _loadInfo->Fields[f].Name); + _loadInfo->Fields[f].Type, _storageName.c_str(), _loadInfo->Fields[f].Name); break; } ++f; @@ -229,7 +224,7 @@ void DB2DatabaseLoader::LoadStrings(bool custom, LocaleConstant locale, uint32 r { for (uint32 z = 0; z < _loadInfo->Meta->Fields[x].ArraySize; ++z) { - switch (_loadInfo->TypesString[fieldIndex]) + switch (_loadInfo->Fields[fieldIndex].Type) { case FT_FLOAT: case FT_INT: @@ -260,7 +255,7 @@ void DB2DatabaseLoader::LoadStrings(bool custom, LocaleConstant locale, uint32 r break; default: ABORT_MSG("Unknown format character '%c' found in %s meta for field %s", - _loadInfo->TypesString[fieldIndex], _storageName.c_str(), _loadInfo->Fields[fieldIndex].Name); + _loadInfo->Fields[fieldIndex].Type, _storageName.c_str(), _loadInfo->Fields[fieldIndex].Name); break; } ++fieldIndex; diff --git a/src/server/shared/DataStores/DB2DatabaseLoader.h b/src/server/shared/DataStores/DB2DatabaseLoader.h index 4aefc503af0..2eadc450d87 100644 --- a/src/server/shared/DataStores/DB2DatabaseLoader.h +++ b/src/server/shared/DataStores/DB2DatabaseLoader.h @@ -26,7 +26,8 @@ enum HotfixDatabaseStatements : uint32; struct TC_SHARED_API DB2LoadInfo : public DB2FileLoadInfo { - DB2LoadInfo(DB2FieldMeta const* fields, std::size_t fieldCount, DB2Meta const* meta, HotfixDatabaseStatements statement); + constexpr explicit DB2LoadInfo(DB2FieldMeta const* fields, std::size_t fieldCount, DB2Meta const* meta, HotfixDatabaseStatements statement) + : DB2FileLoadInfo(fields, fieldCount, meta), Statement(statement) { } HotfixDatabaseStatements Statement; }; |