From 1715d0afe44a282a356ca88e47c92ec556f094dd Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 27 Mar 2009 01:42:53 +0100
Subject: Fixed include structure in resource/ directory

There is also a new rule that trivial constructors and destructors
should no longer be trivially "documented", since this just takes up
space with no gain.
---
 src/resources/iteminfo.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/resources/iteminfo.h')

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),
-- 
cgit v1.2.3-60-g2f50