summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:42:53 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:43:55 +0100
commit1715d0afe44a282a356ca88e47c92ec556f094dd (patch)
tree36dcaa69dcf0165c33d7da1c1cc1a9f5fb7e228f /src/resources/iteminfo.h
parent511d9ac780e094767e806c9a448ac973279dd4c8 (diff)
downloadmana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.gz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.bz2
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.xz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.zip
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.
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),