From 742f5fd5f7c0d244d833359bf08fd45135261cf1 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 6 Jul 2024 10:34:10 +0100 Subject: [PATCH] Fix a couple of compilation warnings --- Source/items.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index e7116d6de..6971a715d 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -6,7 +6,6 @@ #include "items.h" #include -#include #ifdef _DEBUG #include #endif @@ -1442,8 +1441,6 @@ _item_indexes RndTypeItems(ItemType itemType, int imid, int lvl) _unique_items CheckUnique(Item &item, int lvl, int uper, int uidOffset = 0) { - std::bitset<128> uok = {}; - if (GenerateRnd(100) > uper) return UITEM_INVALID; @@ -1462,11 +1459,11 @@ _unique_items CheckUnique(Item &item, int lvl, int uper, int uidOffset = 0) DiscardRandomValues(1); // Check if uidOffset is out of bounds - if (uidOffset >= validUniques.size()) { + if (static_cast(uidOffset) >= validUniques.size()) { return UITEM_INVALID; } - uint8_t selectedUniqueIndex = validUniques[validUniques.size() - 1 - uidOffset]; + const uint8_t selectedUniqueIndex = validUniques[validUniques.size() - 1 - uidOffset]; return static_cast<_unique_items>(selectedUniqueIndex); } @@ -3363,7 +3360,7 @@ void TryRandomUniqueItem(Item &item, _item_indexes idx, int8_t mLevel, int uper, } // Amount to decrease the final uid by in CheckUnique() to get the desired unique. - const int uidOffset = static_cast(std::count_if(UniqueItems.begin() + uid + 1, UniqueItems.end(), [&uniqueItem](UniqueItem &potentialMatch) { + const auto uidOffset = static_cast(std::count_if(UniqueItems.begin() + uid + 1, UniqueItems.end(), [&uniqueItem](UniqueItem &potentialMatch) { return uniqueItem.UIItemId == potentialMatch.UIItemId && uniqueItem.UIMinLvl == potentialMatch.UIMinLvl; }));