From 63138ba784b255b2e451030d47b66c67535aaaaa Mon Sep 17 00:00:00 2001 From: Guillaume Dupuy Date: Tue, 11 Jul 2017 00:27:04 +0200 Subject: [PATCH] Use correct comparison between enum Was previously (badly) relying on int as boolean behaviour Solves a bug where remove slot was not working with headdress (value 0 in enum TSlotEquipment) --HG-- branch : develop --- code/ryzom/client/src/item_group_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ryzom/client/src/item_group_manager.cpp b/code/ryzom/client/src/item_group_manager.cpp index 3cc45f5f9..e72f2d730 100644 --- a/code/ryzom/client/src/item_group_manager.cpp +++ b/code/ryzom/client/src/item_group_manager.cpp @@ -94,8 +94,8 @@ void CItemGroup::addItem(sint32 createTime, sint32 serial, SLOT_EQUIPMENT::TSlot void CItemGroup::addRemove(std::string slotName) { SLOT_EQUIPMENT::TSlotEquipment slot = SLOT_EQUIPMENT::stringToSlotEquipment(NLMISC::toUpper(slotName)); - if(slot) - removeBeforeEquip.push_back(slot); + if(slot != SLOT_EQUIPMENT::UNDEFINED) + addRemove(slot); } void CItemGroup::addRemove(SLOT_EQUIPMENT::TSlotEquipment slot)