From 5ba33b88bd531446888a45ec7cffe5915a330aee Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Sun, 7 May 2023 21:40:45 -0400 Subject: [PATCH] [Cleanup] Set GetAugmentType() to int again (#3335) # Notes - Augment type can be `-1` for all augment types. --- common/item_instance.h | 2 +- zone/lua_iteminst.cpp | 2 +- zone/lua_iteminst.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/item_instance.h b/common/item_instance.h index 5aa699b10..f9ab558c2 100644 --- a/common/item_instance.h +++ b/common/item_instance.h @@ -108,7 +108,7 @@ namespace EQ bool AvailableWearSlot(uint32 aug_wear_slots) const; int8 AvailableAugmentSlot(int32 augment_type) const; bool IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const; - inline uint32 GetAugmentType() const { return m_item ? m_item->AugType : 0; } + inline int GetAugmentType() const { return m_item ? m_item->AugType : 0; } inline uint32 GetAugmentRestriction() const { return m_item ? m_item->AugRestrict : 0; } inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == item::ItemEffectExpendable) || (m_item->ItemType == item::ItemTypePotion)) : false); } diff --git a/zone/lua_iteminst.cpp b/zone/lua_iteminst.cpp index f10f28f23..105e634b9 100644 --- a/zone/lua_iteminst.cpp +++ b/zone/lua_iteminst.cpp @@ -70,7 +70,7 @@ bool Lua_ItemInst::IsAugmentable() { return self->IsAugmentable(); } -uint32 Lua_ItemInst::GetAugmentType() { +int Lua_ItemInst::GetAugmentType() { Lua_Safe_Call_Int(); return self->GetAugmentType(); } diff --git a/zone/lua_iteminst.h b/zone/lua_iteminst.h index 4e5534677..bf5bd1853 100644 --- a/zone/lua_iteminst.h +++ b/zone/lua_iteminst.h @@ -40,7 +40,7 @@ public: bool IsEquipable(int race, int class_); bool IsEquipable(int slot_id); bool IsAugmentable(); - uint32 GetAugmentType(); + int GetAugmentType(); bool IsExpendable(); Lua_ItemInst GetItem(int slot); Lua_Item GetItem();