From a1efbcf983f136117ed0603efe24157c88c18b4c Mon Sep 17 00:00:00 2001 From: kamilprzyb Date: Thu, 17 Sep 2020 10:40:18 +0200 Subject: [PATCH] removed blob parsing functions that ended up being unused --- src/Database.cpp | 88 ------------------------------------------------ src/Database.hpp | 8 ----- 2 files changed, 96 deletions(-) diff --git a/src/Database.cpp b/src/Database.cpp index 8c42133..0924535 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -635,39 +635,6 @@ void Database::appendBlob(std::vector *blob, int64_t input) { } } -void Database::appendBlob(std::vector* blob, int32_t input) { - for (int i = 0; i < 4; i++) { - char toadd = (input >> (8 * (3 - i))); - blob->push_back(toadd); - } -} - -void Database::appendBlob(std::vector* blob, int16_t input) { - for (int i = 0; i < 2; i++) { - char toadd = (input >> (8 * (1 - i))); - blob->push_back(toadd); - } -} - -void Database::appendBlob(std::vector* blob, sItemBase item) { - appendBlob(blob, item.iID); - appendBlob(blob, item.iType); - appendBlob(blob, item.iOpt); - appendBlob(blob, item.iTimeLimit); -} - -void Database::appendBlob(std::vector* blob, sRunningQuest quest) { - appendBlob(blob, quest.m_aCurrTaskID); - for (int i = 0; i < 3; i++) - appendBlob(blob, quest.m_aKillNPCCount[i]); - for (int i = 0; i < 3; i++) - appendBlob(blob, quest.m_aKillNPCID[i]); - for (int i = 0; i < 3; i++) - appendBlob(blob, quest.m_aNeededItemCount[i]); - for (int i = 0; i < 3; i++) - appendBlob(blob, quest.m_aNeededItemID[i]); -} - int64_t Database::blobToInt64(std::vector::iterator it) { int64_t result = 0; for (int i = 0; i < 8; i++) { @@ -678,59 +645,4 @@ int64_t Database::blobToInt64(std::vector::iterator it) { return result; } -int32_t Database::blobToInt32(std::vector::iterator it) { - int32_t result = 0; - for (int i = 0; i < 4; i++) { - int32_t toAdd = ((int32_t)*it << (8 * (3 - i))); - result += toAdd; - it++; - } - return result; -} - -int16_t Database::blobToInt16(std::vector::iterator it) { - int16_t result = 0; - for (int i = 0; i < 2; i++) { - int16_t toAdd = ((int16_t)*it << (8 * (1 - i))); - result += toAdd; - it++; - } - return result; -} - -sItemBase Database::blobToItemBase(std::vector::iterator it) { - sItemBase result = {}; - result.iID = blobToInt16(it); - it += 2; - result.iOpt = blobToInt32(it); - it += 4; - result.iTimeLimit = blobToInt32(it); - it += 4; - result.iType = blobToInt16(it); - return result; -} - -sRunningQuest Database::blobToRunningQuest(std::vector::iterator it) { - sRunningQuest result = {}; - result.m_aCurrTaskID = blobToInt32(it); - it += 4; - for (int i = 0; i < 3; i++) { - result.m_aKillNPCCount[i] = blobToInt32(it); - it += 4; - } - for (int i = 0; i < 3; i++) { - result.m_aKillNPCID[i] = blobToInt32(it); - it += 4; - } - for (int i = 0; i < 3; i++) { - result.m_aNeededItemCount[i] = blobToInt32(it); - it += 4; - } - for (int i = 0; i < 3; i++) { - result.m_aNeededItemID[i] = blobToInt32(it); - it += 4; - } - return result; -} - #pragma endregion parsingBlobs diff --git a/src/Database.hpp b/src/Database.hpp index b01ff8d..9b15b88 100644 --- a/src/Database.hpp +++ b/src/Database.hpp @@ -127,13 +127,5 @@ namespace Database { //parsing blobs void appendBlob(std::vector*blob, int64_t input); - void appendBlob(std::vector* blob, int32_t input); - void appendBlob(std::vector* blob, int16_t input); - void appendBlob(std::vector* blob, sItemBase item); - void appendBlob(std::vector* blob, sRunningQuest quest); int64_t blobToInt64(std::vector::iterator it); - int32_t blobToInt32(std::vector::iterator it); - int16_t blobToInt16(std::vector::iterator it); - sItemBase blobToItemBase(std::vector::iterator it); - sRunningQuest blobToRunningQuest(std::vector::iterator it); }