summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r--src/resources/iteminfo.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index d84ee603..bcee1fbd 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -22,14 +22,14 @@
#ifndef ITEMINFO_H
#define ITEMINFO_H
+#include "resources/spritedef.h"
+
+#include "being.h"
+
#include <map>
#include <string>
#include <vector>
-#include "spritedef.h"
-
-#include "../being.h"
-
enum EquipmentSoundEvent
{
EQUIP_EVENT_STRIKE,
@@ -117,8 +117,6 @@ class ItemInfo
ItemInfo():
#ifdef TMWSERV_SUPPORT
mType(ITEM_UNUSABLE),
-#else
- mType(""),
#endif
mWeight(0),
mView(0),