From 832944db24b917e55dd3fccfa44302031bdd6e2e Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 3 Jun 2016 00:00:49 +0200 Subject: Core/PacketIO: Updated SMSG_DB_REPLY --- src/server/shared/DataStores/DB2Store.h | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h index e673b8a6a97..bf10d78f37b 100644 --- a/src/server/shared/DataStores/DB2Store.h +++ b/src/server/shared/DataStores/DB2Store.h @@ -84,33 +84,23 @@ protected: buffer << *(uint8*)entry; entry += 1; break; + case FT_SHORT: + buffer << *(uint16*)entry; + entry += 2; + break; case FT_STRING: { LocalizedString* locStr = *(LocalizedString**)entry; if (locStr->Str[locale][0] == '\0') locale = 0; - char const* str = locStr->Str[locale]; - std::size_t len = strlen(str); - buffer << uint16(len ? len + 1 : 0); - if (len) - { - buffer.append(str, len); - buffer << uint8(0); - } + buffer << locStr->Str[locale]; entry += sizeof(LocalizedString*); break; } case FT_STRING_NOT_LOCALIZED: { - char const* str = *(char const**)entry; - std::size_t len = strlen(str); - buffer << uint16(len ? len + 1 : 0); - if (len) - { - buffer.append(str, len); - buffer << uint8(0); - } + buffer << *(char const**)entry; entry += sizeof(char const*); break; } -- cgit v1.2.3