summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/playerinfo.cpp6
-rw-r--r--src/enums/resources/itemtype.h (renamed from src/resources/itemtype.h)0
-rw-r--r--src/gui/popups/itempopup.h4
-rw-r--r--src/resources/iteminfo.h3
-rw-r--r--src/resources/itemtypemap.h2
7 files changed, 9 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7cad1890..92df48845 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -664,7 +664,7 @@ SET(SRCS
resources/itemslot.h
enums/resources/imageposition.h
enums/resources/itemsoundevent.h
- resources/itemtype.h
+ enums/resources/itemtype.h
resources/itemtypemap.h
resources/itemtypemapdata.h
resources/db/mapdb.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index bb16842c9..02dae31ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1197,7 +1197,7 @@ manaplus_SOURCES += main.cpp \
resources/itemslot.h \
enums/resources/imageposition.h \
enums/resources/itemsoundevent.h \
- resources/itemtype.h \
+ enums/resources/itemtype.h \
resources/itemtypemap.h \
resources/itemtypemapdata.h \
resources/mapinfo.h \
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 11a33a175..ecd83ad40 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -30,6 +30,8 @@
#include "being/homunculusinfo.h"
#include "being/mercenaryinfo.h"
#include "being/petinfo.h"
+
+#include "enums/resources/itemtype.h"
#endif
#include "gui/windows/inventorywindow.h"
@@ -40,10 +42,6 @@
#include "net/mercenaryhandler.h"
#include "net/playerhandler.h"
-#ifdef EATHENA_SUPPORT
-#include "resources/itemtype.h"
-#endif
-
#include "resources/item/item.h"
#include "utils/delete2.h"
diff --git a/src/resources/itemtype.h b/src/enums/resources/itemtype.h
index 489dc3c44..489dc3c44 100644
--- a/src/resources/itemtype.h
+++ b/src/enums/resources/itemtype.h
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index ebab18170..7f5481627 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -24,12 +24,12 @@
#ifndef GUI_POPUPS_ITEMPOPUP_H
#define GUI_POPUPS_ITEMPOPUP_H
+#include "enums/resources/itemtype.h"
+
#include "enums/simpletypes/itemcolor.h"
#include "gui/widgets/popup.h"
-#include "resources/itemtype.h"
-
class Icon;
class Item;
class ItemInfo;
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index c07136581..59b6a0b99 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -25,11 +25,12 @@
#include "enums/being/gender.h"
+#include "enums/resources/itemtype.h"
+
#include "enums/simpletypes/beingtypeid.h"
#include "enums/simpletypes/itemcolor.h"
#include "resources/cursor.h"
-#include "resources/itemtype.h"
#include "resources/soundinfo.h"
#include "resources/sprite/spritedisplay.h"
diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h
index 0f88fdb84..ccf70068b 100644
--- a/src/resources/itemtypemap.h
+++ b/src/resources/itemtypemap.h
@@ -21,7 +21,7 @@
#ifndef RESOURCES_ITEMTYPEMAP_H
#define RESOURCES_ITEMTYPEMAP_H
-#include "resources/itemtype.h"
+#include "enums/resources/itemtype.h"
#include <string>