pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed ItemClass enumeration to ItemClassTypes enumeration

Browse Source
This commit is contained in:
Uleat 2013-10-27 06:38:34 -04:00
parent e53fa1d873
commit df47e17c8e
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -11,6 +11,7 @@ Uleat: Changed riposte enabling check to proper failure criteria (x == 1 && x ==
Uleat: Enforced naming standard on my recent changes (Sorry for any inconviencies) Uleat: Enforced naming standard on my recent changes (Sorry for any inconviencies)
Uleat: Moved DeityTypes enumeration from eq_constants.h to deity.h (expanded utility of accessors, but are yet to be implemented) Uleat: Moved DeityTypes enumeration from eq_constants.h to deity.h (expanded utility of accessors, but are yet to be implemented)
Uleat: Changed ItemUseType to ItemInstTypes to better reflect the definition (also to free-up the namespace) Uleat: Changed ItemUseType to ItemInstTypes to better reflect the definition (also to free-up the namespace)
Uleat: Changed ItemClass to ItemClassTypes
== 10/24/2013 == == 10/24/2013 ==
demonstar55: Fix some memory leaks in Mob::SpellOnTarget demonstar55: Fix some memory leaks in Mob::SpellOnTarget

2
common/Item.cpp
View File

@ -220,7 +220,7 @@ ItemInst* ItemInst::Clone() const
} }
// Query item type // Query item type
bool ItemInst::IsType(ItemClass item_class) const bool ItemInst::IsType(ItemClassTypes item_class) const
{ {
// Check usage type // Check usage type
if ((m_use_type == ItemInstWorldContainer) && (item_class == ItemClassContainer)) if ((m_use_type == ItemInstWorldContainer) && (item_class == ItemClassContainer))

2
common/Item.h
View File

@ -287,7 +287,7 @@ public:
~ItemInst(); ~ItemInst();
// Query item type // Query item type
bool IsType(ItemClass item_class) const; bool IsType(ItemClassTypes item_class) const;
// Can item be stacked? // Can item be stacked?
bool IsStackable() const; bool IsStackable() const;

11
common/eq_constants.h
View File

@ -38,14 +38,15 @@ enum ItemAttributes : uint32
}; };
/* /*
** Item types ** Item class types
** **
*/ */
enum ItemClass enum ItemClassTypes
{ {
ItemClassCommon = 0, ItemClassCommon = 0,
ItemClassContainer = 1, ItemClassContainer,
ItemClassBook = 2 ItemClassBook,
_ItemClassCount
}; };
/* /*

2
zone/lua_iteminst.cpp
View File

@ -41,7 +41,7 @@ Lua_ItemInst::Lua_ItemInst(const Lua_ItemInst& o) {
bool Lua_ItemInst::IsType(int item_class) { bool Lua_ItemInst::IsType(int item_class) {
Lua_Safe_Call_Bool(); Lua_Safe_Call_Bool();
return self->IsType(static_cast<ItemClass>(item_class)); return self->IsType(static_cast<ItemClassTypes>(item_class));
} }
bool Lua_ItemInst::IsStackable() { bool Lua_ItemInst::IsStackable() {

2
zone/perl_questitem.cpp
View File

@ -134,7 +134,7 @@ XS(XS_QuestItem_IsType)
if(THIS == nullptr) if(THIS == nullptr)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->IsType((ItemClass)type); RETVAL = THIS->IsType((ItemClassTypes)type);
ST(0) = boolSV(RETVAL); ST(0) = boolSV(RETVAL);
sv_2mortal(ST(0)); sv_2mortal(ST(0));
} }