Merchants will now keep track of charges sold to them properly so it is no longer possible to recharge items using merchants.

common/Item.cpp

@@ -238,6 +238,14 @@ bool ItemInst::IsStackable() const
 	return m_item->Stackable;
 }
 
+bool ItemInst::IsCharged() const
+{
+	if(m_item->MaxCharges > 1)
+		return true;
+	else
+		return false;
+}
+
 // Can item be equipped?
 
 bool ItemInst::IsEquipable(uint16 race, uint16 class_) const

common/Item.h

@@ -291,6 +291,7 @@ public:
 
 	// Can item be stacked?
 	bool IsStackable() const;
+	bool IsCharged() const;
 
 	// Can item be equipped by/at?
 	bool IsEquipable(uint16 race, uint16 class_) const;