Revert "Tie NEEDEXCHANGE behavior to classicEquipmentSlots setting (#…

…4097)" This reverts commit c506a2f.
otland · Apr 30, 2022 · d3fac76 · d3fac76
1 parent 5c3e0a3
commit d3fac76
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/player.cpp b/src/player.cpp
@@ -2662,15 +2662,12 @@ ReturnValue Player::queryAdd(int32_t index, const Thing& thing, uint32_t count,
 	// need an exchange with source? (destination item is swapped with currently moved item)
 	const Item* inventoryItem = getInventoryItem(static_cast<slots_t>(index));
 	if (inventoryItem && (!inventoryItem->isStackable() || inventoryItem->getID() != item->getID())) {
-		if (!g_config.getBoolean(ConfigManager::CLASSIC_EQUIPMENT_SLOTS)) {
-			const Cylinder* cylinder = item->getTopParent();
-			if (cylinder && (dynamic_cast<const DepotChest*>(cylinder) || dynamic_cast<const Player*>(cylinder))) {
-				return RETURNVALUE_NEEDEXCHANGE;
-			}
-			return RETURNVALUE_NOTENOUGHROOM;
+		const Cylinder* cylinder = item->getTopParent();
+		if (cylinder && (dynamic_cast<const DepotChest*>(cylinder) || dynamic_cast<const Player*>(cylinder))) {
+			return RETURNVALUE_NEEDEXCHANGE;
 		}
 
-		return RETURNVALUE_NEEDEXCHANGE;
+		return RETURNVALUE_NOTENOUGHROOM;
 	}
 	return ret;
 }