diff --git a/zone/aa.cpp b/zone/aa.cpp index 110885fef..c15d5ba8c 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -448,7 +448,7 @@ void Mob::WakeTheDead(uint16 spell_id, Mob *target, uint32 duration) sitem = CorpseToUse->GetWornItem(x); if(sitem){ const EQ::ItemData * itm = database.GetItem(sitem); - npca->AddLootDrop(itm, &npca->itemlist, LootDropEntries_Struct{ .equip_item = true }, true); + npca->AddLootDrop(itm, &npca->itemlist, LootDropEntries_Struct{ .equip_item = 1 }, true); } } diff --git a/zone/loottables.cpp b/zone/loottables.cpp index ea563de38..b3f46f649 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -509,7 +509,7 @@ void NPC::AddLootDrop( void NPC::AddItem(const EQ::ItemData* item, uint16 charges, bool equipitem) { //slot isnt needed, its determined from the item. - AddLootDrop(item, &itemlist, LootDropEntries_Struct{ .equip_item = equipitem }, true); + AddLootDrop(item, &itemlist, LootDropEntries_Struct{ .equip_item = static_cast(equipitem ? 1 : 0) }, true); } void NPC::AddItem(uint32 itemid, uint16 charges, bool equipitem, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6) { diff --git a/zone/pets.cpp b/zone/pets.cpp index f8d0a6c37..5d4359d64 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -394,7 +394,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) if (petinv[i]) { item = database.GetItem(petinv[i]); - npc->AddLootDrop(item, &npc->itemlist, LootDropEntries_Struct{ .equip_item = true }, true); + npc->AddLootDrop(item, &npc->itemlist, LootDropEntries_Struct{ .equip_item = 1 }, true); } } @@ -614,18 +614,18 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) { //restore their equipment... for (i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) { - if(items[i] == 0) + if (items[i] == 0) { continue; + } - const EQ::ItemData* item2 = database.GetItem(items[i]); + const EQ::ItemData *item2 = database.GetItem(items[i]); if (item2) { - bool noDrop=(item2->NoDrop == 0); // Field is reverse logic - bool petCanHaveNoDrop = (RuleB(Pets, CanTakeNoDrop) && - _CLIENTPET(this) && GetPetType() <= petOther); + bool noDrop = (item2->NoDrop == 0); // Field is reverse logic + bool petCanHaveNoDrop = (RuleB(Pets, CanTakeNoDrop) && _CLIENTPET(this) && GetPetType() <= petOther); if (!noDrop || petCanHaveNoDrop) { - AddLootDrop(item2, &itemlist, LootDropEntries_Struct{.equip_item = true }, true); + AddLootDrop(item2, &itemlist, LootDropEntries_Struct{.equip_item = 1}, true); } } } diff --git a/zone/trading.cpp b/zone/trading.cpp index b192ae8fe..9a58d46a6 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -902,7 +902,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st tradingWith->CastToNPC()->AddLootDrop( bagitem, &tradingWith->CastToNPC()->itemlist, - LootDropEntries_Struct{.item_charges = static_cast(baginst->GetCharges()), .equip_item = true }, + LootDropEntries_Struct{.item_charges = static_cast(baginst->GetCharges()), .equip_item = 1 }, true ); } @@ -916,7 +916,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st tradingWith->CastToNPC()->AddLootDrop( item, &tradingWith->CastToNPC()->itemlist, - LootDropEntries_Struct{.item_charges = static_cast(inst->GetCharges()), .equip_item = true }, + LootDropEntries_Struct{.item_charges = static_cast(inst->GetCharges()), .equip_item = 1 }, true ); }