pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Convert DeleteItemInInventory quantity to int16. (#1767)

Browse Source 
* [Cleanup] Convert DeleteItemInInventory quantity to int16.

* Type conversion.
This commit is contained in:
Kinglykrab
2021-11-16 08:52:22 -05:00
committed by GitHub
parent bf8a0328b3
commit 3efd9c7f60
10 changed files with 81 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/tribute.cpp
+7 -7
View File
@@ -138,20 +138,20 @@ void Client::DoTributeUpdate() {
uint32 tid = m_pp.tributes[r].tribute;
if(tid == TRIBUTE_NONE) {
if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r])
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false);
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r);
continue;
}
if(tribute_list.count(tid) != 1) {
if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r])
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false);
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r);
continue;
}
//sanity check
if(m_pp.tributes[r].tier >= MAX_TRIBUTE_TIERS) {
if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r])
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false);
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r);
m_pp.tributes[r].tier = 0;
continue;
}
@@ -165,7 +165,7 @@ void Client::DoTributeUpdate() {
if(inst == nullptr)
continue;
PutItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, *inst, false);
PutItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, *inst);
SendItemPacket(EQ::invslot::TRIBUTE_BEGIN + r, inst, ItemPacketTributeItem);
safe_delete(inst);
}
@@ -173,7 +173,7 @@ void Client::DoTributeUpdate() {
//unequip tribute items...
for (r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) {
if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r])
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false);
DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r);
}
}
CalcBonuses();
@@ -261,10 +261,10 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) {
if(inst->IsStackable()) {
if(inst->GetCharges() < (int32)quantity) //dont have enough....
return(0);
DeleteItemInInventory(slot, quantity, false);
DeleteItemInInventory(slot, quantity);
} else {
quantity = 1;
DeleteItemInInventory(slot, 0, false);
DeleteItemInInventory(slot);
}
pts *= quantity;