Tweaks: weapon charges should be at minimum 1

EQEmu · Oct 15, 2024 · 4bdc3cb · 4bdc3cb
1 parent 568d081
commit 4bdc3cb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/zone/client.cpp b/zone/client.cpp
@@ -12892,18 +12892,20 @@ bool Client::CheckHandin(
 	}
 
 	// pull hand-in items from the item instances
-	for (const auto &i: items) {
-		if (!i) {
-			continue;
-		}
-
-		h.items.emplace_back(
-			HandinEntry{
-				.item_id = std::to_string(i->GetItem()->ID),
-				.count = static_cast<uint32>(i->GetCharges()),
-				.item = i
+	if (!m_handin_started) {
+		for (const auto &i: items) {
+			if (!i) {
+				continue;
 			}
-		);
+
+			h.items.emplace_back(
+				HandinEntry{
+					.item_id = std::to_string(i->GetItem()->ID),
+					.count = std::max(static_cast<uint16>(i->GetCharges()), static_cast<uint16>(1)),
+					.item = i
+				}
+			);
+		}
 	}
 
 	// compare hand-in to required, the item_id can be in any slot
@@ -13028,7 +13030,7 @@ void Client::ReturnHandinItems()
 					.item_name = i.item->GetItem()->Name,
 					.augment_ids = i.item->GetAugmentIDs(),
 					.augment_names = i.item->GetAugmentNames(),
-					.charges = static_cast<uint16>(i.item->GetCharges())
+					.charges = std::max(static_cast<uint16>(i.item->GetCharges()), static_cast<uint16>(1))
 				}
 			);
 		}
@@ -13055,7 +13057,7 @@ void Client::ReturnHandinItems()
 					.item_name = i.item->GetItem()->Name,
 					.augment_ids = i.item->GetAugmentIDs(),
 					.augment_names = i.item->GetAugmentNames(),
-					.charges = static_cast<uint16>(i.item->GetCharges())
+					.charges = std::max(static_cast<uint16>(i.item->GetCharges()), static_cast<uint16>(1))
 				}
 			);
 

diff --git a/zone/client.h b/zone/client.h
@@ -1822,7 +1822,7 @@ class Client : public Mob
 	// NPC Handin
 	struct HandinEntry {
 		std::string            item_id = "0";
-		uint32                 count   = 0;
+		uint16                 count   = 0;
 		const EQ::ItemInstance *item   = nullptr;
 	};