1 files changed, 14 insertions, 3 deletions
diff --git a/src/item.cpp b/src/item.cpp
index 9165c6c8..042c3800 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -24,11 +24,17 @@
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-Item::Item(int id, int quantity, bool equipment, bool equipped):
+Item::Item(int id, int quantity, bool equipment
+#ifdef EATHENA_SUPPORT
+           , bool equipped
+#endif
+           ):
     mImage(0),
     mQuantity(quantity),
-    mEquipment(equipment),
-    mEquipped(equipped)
+    mEquipment(equipment)
+#ifdef EATHENA_SUPPORT
+    , mEquipped(equipped)
+#endif
 {
     setId(id);
 }
@@ -43,6 +49,11 @@ void Item::setId(int id)
 {
     mId = id;
 
+#ifdef TMWSERV_SUPPORT
+    // Types 0 and 1 are not equippable items.
+    mEquipment = id && getInfo().getType() >= 2;
+#endif
+
     // Load the associated image
     if (mImage)
         mImage->decRef();