pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-04 12:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 'is_arrow' bool parameter

Browse Source
This commit is contained in:
Uleat 2018-07-25 16:22:22 -04:00
parent 483a34242b
commit 8089d52df6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/client.cpp
View File

@ -2683,7 +2683,7 @@ void Client::LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32
} }
void Client::Disarm(Client* disarmer, int chance) { void Client::Disarm(Client* disarmer, int chance) {
int16 slot = -1; int16 slot = EQEmu::invslot::SLOT_INVALID;
const EQEmu::ItemInstance *inst = this->GetInv().GetItem(EQEmu::invslot::slotPrimary); const EQEmu::ItemInstance *inst = this->GetInv().GetItem(EQEmu::invslot::slotPrimary);
if (inst && inst->IsWeapon()) { if (inst && inst->IsWeapon()) {
slot = EQEmu::invslot::slotPrimary; slot = EQEmu::invslot::slotPrimary;
@ -2693,13 +2693,13 @@ void Client::Disarm(Client* disarmer, int chance) {
if (inst && inst->IsWeapon()) if (inst && inst->IsWeapon())
slot = EQEmu::invslot::slotSecondary; slot = EQEmu::invslot::slotSecondary;
} }
if (slot != -1 && inst->IsClassCommon()) { if (slot != EQEmu::invslot::SLOT_INVALID && inst->IsClassCommon()) {
// We have an item that can be disarmed. // We have an item that can be disarmed.
if (zone->random.Int(0, 1000) <= chance) { if (zone->random.Int(0, 1000) <= chance) {
// Find a free inventory slot // Find a free inventory slot
int16 slot_id = -1; int16 slot_id = EQEmu::invslot::SLOT_INVALID;
slot_id = m_inv.FindFreeSlot(false, true, inst->GetItem()->Size, inst->GetItem()->ItemType); slot_id = m_inv.FindFreeSlot(false, true, inst->GetItem()->Size, (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow));
if (slot_id != -1) if (slot_id != EQEmu::invslot::SLOT_INVALID)
{ {
EQEmu::ItemInstance *InvItem = m_inv.PopItem(slot); EQEmu::ItemInstance *InvItem = m_inv.PopItem(slot);
if (InvItem) { // there should be no way it is not there, but check anyway if (InvItem) { // there should be no way it is not there, but check anyway
@ -2714,8 +2714,8 @@ void Client::Disarm(Client* disarmer, int chance) {
FastQueuePacket(&outapp); // this deletes item from the weapon slot on the client FastQueuePacket(&outapp); // this deletes item from the weapon slot on the client
if (PutItemInInventory(slot_id, *InvItem, true)) if (PutItemInInventory(slot_id, *InvItem, true))
database.SaveInventory(this->CharacterID(), NULL, slot); database.SaveInventory(this->CharacterID(), NULL, slot);
int matslot = slot == EQEmu::invslot::slotPrimary ? EQEmu::textures::weaponPrimary : EQEmu::textures::weaponSecondary; auto matslot = (slot == EQEmu::invslot::slotPrimary ? EQEmu::textures::weaponPrimary : EQEmu::textures::weaponSecondary);
if (matslot != -1) if (matslot != EQEmu::textures::materialInvalid)
SendWearChange(matslot); SendWearChange(matslot);
} }
Message_StringID(MT_Skills, DISARMED); Message_StringID(MT_Skills, DISARMED);