items disappearing after last charge is used - possible fix, test your items!

[Congdar]

here's the fix for the charged item duping:

in PlayerCorpse.cpp find method: void Corpse::MoveItemToCorpse(Client *client, ItemInst *item, sint16 equipslot)
then find:

client->DeleteItemInInventory(interior_slot, interior_item->GetCharges(), false);

and delete the last 2 args so it looks like:

client->DeleteItemInInventory(interior_slot);

and the same for the one a couple of lines below it find:

client->DeleteItemInInventory(equipslot, item->GetCharges(), false);

change to:

client->DeleteItemInInventory(equipslot);

[cavedude]

I tested the recent changes briefly on my test server and all looked well. It'll go Live on PEQ with the reboot in the morning. Thanks for perfecting this! If all goes well tomorrow, might as well commit to SVN.

[Congdar]

This fixes the Wee Harvester from poofing when the last charge is used:
Inventory.cpp find method: void Client::DeleteItemInInventory(sint16 slot_id, sint8 quantity, bool client_update) then find:

	if(m_inv[slot_id]->GetItem()->Click.Type == ET_EquipClick) {

and replace with:

	if((m_inv[slot_id]->GetItem()->Click.Type == ET_EquipClick) || (m_inv[slot_id]->IsWeapon())) {

and this fixes the items that are getting recharged when looting from your corpse:
PlayerCorpse.cpp find method: void Corpse::LootItem(Client* client, const EQApplicationPacket* app) then find:

		if(inst->IsStackable()) {
			if(item_data) 
				//Restore charges from the original item.
				inst->SetCharges(item_data->charges);
			else
				inst->SetCharges(1);
		} else {
			//default changes
			if(item->MaxCharges == -1)
				inst->SetCharges(1);
			else
				inst->SetCharges(item->MaxCharges);
		}

and replace with:

		if(inst->IsStackable()) {
			if(item_data) 
				//Restore charges from the original item.
				inst->SetCharges(item_data->charges);
			else
				inst->SetCharges(1);
		} else {
			//default changes
			if(item->MaxCharges == -1)
				inst->SetCharges(1);
			else {
				if(item_data) {
					//Restore charges from the original item.
					inst->SetCharges(item_data->charges);
				}
				else {
					inst->SetCharges(item->MaxCharges);
				}
			}
		}

[cavedude]

This has been on PEQ for a bit now with no ill effects reported. It works like a charm. I say commit it.

[Congdar]

Thanks for testing this on your server Cavedude. Committed in SVN 278.