summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/flooritem.cpp2
-rw-r--r--src/being/flooritem.h8
-rw-r--r--src/being/playerinfo.cpp3
3 files changed, 7 insertions, 6 deletions
diff --git a/src/being/flooritem.cpp b/src/being/flooritem.cpp
index 72f30998e..00b4ae45a 100644
--- a/src/being/flooritem.cpp
+++ b/src/being/flooritem.cpp
@@ -46,7 +46,7 @@ extern volatile int cur_time;
FloorItem::FloorItem(const BeingId id,
const int itemId,
const int x, const int y,
- const int itemType,
+ const ItemTypeT itemType,
const int amount,
const int refine,
const ItemColor color,
diff --git a/src/being/flooritem.h b/src/being/flooritem.h
index bb57039e1..1b5b87d3e 100644
--- a/src/being/flooritem.h
+++ b/src/being/flooritem.h
@@ -25,6 +25,8 @@
#include "const/resources/item/cards.h"
+#include "enums/resources/itemtype.h"
+
#include "enums/simpletypes/damaged.h"
#include "enums/simpletypes/identified.h"
#include "enums/simpletypes/itemcolor.h"
@@ -54,7 +56,7 @@ class FloorItem final : public ActorSprite
FloorItem(const BeingId id,
const int itemId,
const int x, const int y,
- const int itemType,
+ const ItemTypeT itemType,
const int amount,
const int refine,
const ItemColor color,
@@ -121,7 +123,7 @@ class FloorItem final : public ActorSprite
int getRefine() const A_WARN_UNUSED
{ return mRefine; }
- int getItemType() const A_WARN_UNUSED
+ ItemTypeT getItemType() const A_WARN_UNUSED
{ return mItemType; }
Identified getIdentified() const A_WARN_UNUSED
@@ -138,7 +140,7 @@ class FloorItem final : public ActorSprite
int mAmount;
int mRefine;
int mHeightPosDiff;
- int mItemType;
+ ItemTypeT mItemType;
unsigned int mPickupCount;
Cursor::Cursor mCursor;
ItemColor mColor;
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 04bb267aa..2d8f21056 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -276,8 +276,7 @@ void useEquipItem(const Item *const item, const Sfx sfx)
if (item)
{
#ifdef EATHENA_SUPPORT
- // IT_CARD
- if (item->getType() == 6)
+ if (item->getType() == ItemType::Card)
{
if (mProtectedItems.find(item->getId()) == mProtectedItems.end())
{