[Bug Fix] Allow Items in ROF2 to Stack to 32,767 (EQEmu#4556)

* [Bug Fix] Allow Items in ROF2 to Stack to 32,767 * Update rof2.cpp
MortimerGreenwald · Dec 13, 2024 · c9422ae · c9422ae
1 parent 612b03a
commit c9422ae
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
@@ -6365,9 +6365,18 @@ namespace RoF2
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
 		strn0cpy(hdr.unknown000, fmt::format("{:016}\0", inst->GetSerialNumber()).c_str(),sizeof(hdr.unknown000));
 
-		hdr.stacksize =
-			item->ID == PARCEL_MONEY_ITEM_ID ? inst->GetPrice() : (inst->IsStackable() ? ((inst->GetCharges() > 1000)
-				? 0xFFFFFFFF : inst->GetCharges()) : 1);
+		hdr.stacksize = 1;
+
+		if (item->ID == PARCEL_MONEY_ITEM_ID) {
+			hdr.stacksize = inst->GetPrice();
+		} else if (inst->IsStackable()) {
+			if (inst->GetCharges() > std::numeric_limits<int16>::max()) {
+				hdr.stacksize = std::numeric_limits<uint32>::max();
+			} else {
+				hdr.stacksize = inst->GetCharges();
+			}
+		}
+
 		hdr.unknown004 = 0;
 
 		structs::InventorySlot_Struct slot_id{};