summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-18 20:58:02 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-18 20:58:02 +0300
commit3897d9afdfe615f29fc4dd0d7c0b5564f585c524 (patch)
tree94680626fa15133eec0d909e2e038836a7e1ab12 /src/resources
parenta3e458c6c5d1fc7cda0afcab74ff95f7a63b728a (diff)
downloadplus-3897d9afdfe615f29fc4dd0d7c0b5564f585c524.tar.gz
plus-3897d9afdfe615f29fc4dd0d7c0b5564f585c524.tar.bz2
plus-3897d9afdfe615f29fc4dd0d7c0b5564f585c524.tar.xz
plus-3897d9afdfe615f29fc4dd0d7c0b5564f585c524.zip
Remove extra includes.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp1
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/resources/iteminfo.h7
3 files changed, 8 insertions, 2 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index f54f5075b..041dda9be 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -31,6 +31,7 @@
#include "fs/virtfs/tools.h"
#include "resources/iteminfo.h"
+#include "resources/itemmenuitem.h"
#include "resources/itemtypemapdata.h"
#include "resources/db/itemfielddb.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 118ce5d71..2997a48ad 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -28,6 +28,8 @@
#include "enums/resources/spritedirection.h"
+#include "resources/itemmenuitem.h"
+
#include "resources/db/colordb.h"
#include "resources/db/itemdb.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 414fa45b8..28b9d9049 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -28,10 +28,9 @@
#include "enums/resources/item/itemdbtype.h"
#include "enums/simpletypes/beingtypeid.h"
+#include "enums/simpletypes/itemcolor.h"
#include "resources/cursors.h"
-#include "resources/itemcolordata.h"
-#include "resources/itemmenuitem.h"
#include "resources/missileinfo.h"
#include "resources/soundinfo.h"
@@ -40,6 +39,10 @@
#include "utils/cast.h"
#include "utils/intmap.h"
+class ItemColorData;
+
+struct ItemMenuItem;
+
// sprite, <itemfrom, itemto>
typedef std::map<int, IntMap> SpriteToItemMap;
typedef SpriteToItemMap::const_iterator SpriteToItemMapCIter;