Merge pull request #5 from Valorith/copilot/fix-ff2b6de1-c436-4d71-b9f4-dfeb78b9fa7f

Enhance SummonItemIntoInventory to support stacking of items

common/CMakeLists.txt

@@ -842,6 +842,11 @@ ENDIF (UNIX)
 
 IF (EQEMU_BUILD_PCH)
     TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/std-pch.h)
+    # Avoid PCH/__OPTIMIZE__ mismatch when compiling certain patch sources with -O0
+    # These files are compiled with -O0 on UNIX (see COMPILE_FLAGS above), which
+    # disables the __OPTIMIZE__ predefined macro. Disabling PCH for them prevents
+    # Clang from erroring due to macro state differences between the PCH and TU.
+    SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 ENDIF ()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

zone/inventory.cpp

@@ -4607,6 +4607,9 @@ void Client::SummonItemIntoInventory(
 		return;
 	}
 
+	// Try stacking first if the item is stackable, then fall back to finding a free slot
+	if (!PutItemInInventoryWithStacking(inst)) {
+		// PutItemInInventoryWithStacking failed, fall back to original behavior
 		const bool  is_arrow = inst->GetItem()->ItemType == EQ::item::ItemTypeArrow;
 		const int16 slot_id  = m_inv.FindFreeSlot(
 			inst->IsClassBag(),
@@ -4629,6 +4632,9 @@ void Client::SummonItemIntoInventory(
 		);
 	}
 
+	safe_delete(inst);
+}
+
 bool Client::HasItemOnCorpse(uint32 item_id)
 {
 	auto corpses = CharacterCorpsesRepository::GetWhere(database, fmt::format("charid = {}", CharacterID()));