diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 71749be45..0a052824a 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -1155,14 +1155,14 @@ bool Client::AutoPutLootInInventory(EQ::ItemInstance& inst, bool try_worn, bool } } if( i == EQ::invslot::slotPrimary && m_inv[EQ::invslot::slotSecondary] ) { - uint8 instrument = m_inv[MainSecondary]->GetItem()->ItemType; + uint8 instrument = m_inv[EQ::invslot::slotSecondary]->GetItem()->ItemType; if( instrument == EQ::item::ItemTypeWindInstrument || instrument == EQ::item::ItemTypeStringedInstrument || instrument == EQ::item::ItemTypeBrassInstrument || instrument == EQ::item::ItemTypePercussionInstrument ) { - LogInventory("Cannot equip a primary item with [{}] already in the secondary.", m_inv[MainSecondary]->GetItem()->Name); + LogInventory("Cannot equip a primary item with [{}] already in the secondary.", m_inv[EQ::invslot::slotSecondary]->GetItem()->Name); continue; // Do not auto-equip Primary when instrument is in Secondary } } @@ -1174,11 +1174,11 @@ bool Client::AutoPutLootInInventory(EQ::ItemInstance& inst, bool try_worn, bool instrument == EQ::item::ItemTypeBrassInstrument || instrument == EQ::item::ItemTypePercussionInstrument ) { - LogInventory("Cannot equip a secondary instrument with [{}] already in the primary.", m_inv[MainPrimary]->GetItem()->Name); + LogInventory("Cannot equip a secondary instrument with [{}] already in the primary.", m_inv[EQ::invslot::slotPrimary]->GetItem()->Name); continue; // Do not auto-equip instrument in Secondary when Primary is equipped. } - uint8 use = m_inv[MainPrimary]->GetItem()->ItemType; + uint8 use = m_inv[EQ::invslot::slotPrimary]->GetItem()->ItemType; if(use == EQ::item::ItemType2HSlash || use == EQ::item::ItemType2HBlunt || use == EQ::item::ItemType2HPiercing) { continue; }