diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 0bba56d9e..ff6608d84 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -35,7 +35,6 @@ #include "QuestParserCollection.h" extern WorldServer worldserver; -// @merth: this needs to be touched up uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { if (itemnum == 0) return 0; @@ -598,8 +597,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, // Drop item from inventory to ground (generally only dropped from SLOT_CURSOR) void Client::DropItem(int16 slot_id) { - if(GetInv().CheckNoDrop(slot_id) && RuleI(World, FVNoDropFlag) == 0 || - RuleI(Character, MinStatusForNoDropExemptions) < Admin() && RuleI(World, FVNoDropFlag) == 2) { + if(GetInv().CheckNoDrop(slot_id) && RuleI(World, FVNoDropFlag) == 0 || RuleI(Character, MinStatusForNoDropExemptions) < Admin() && RuleI(World, FVNoDropFlag) == 2) { database.SetHackerFlag(this->AccountName(), this->GetCleanName(), "Tried to drop an item on the ground that was nodrop!"); GetInv().DeleteItem(slot_id); return; @@ -682,7 +680,7 @@ int32 Client::GetAugmentIDAt(int16 slot_id, uint8 augslot) { } // Remove item from inventory -void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_update, bool update_db) { +void Client::DeleteItemInInventory(int16 slot_id, int16 quantity, bool client_update, bool update_db) { #if (EQDEBUG >= 5) LogFile->write(EQEMuLog::Debug, "DeleteItemInInventory(%i, %i, %s)", slot_id, quantity, (client_update) ? "true":"false"); #endif diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 5f4be3cd8..d8fe49793 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -3011,7 +3011,7 @@ XS(XS_Client_DeleteItemInInventory) { Client * THIS; int16 slot_id = (int16)SvIV(ST(1)); - int8 quantity; + int16 quantity; bool client_update; if (sv_derived_from(ST(0), "Client")) {