Move invetory into inventory directory.

18 files changed, 33 insertions, 21 deletions

diff --git a/Android.mk b/Android.mk
index 6c17bc043..4cec74077 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,6 +71,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     $(wildcard $(LOCAL_PATH)/src/resources/atlas/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/db/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/dye/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/resources/inventory/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/item/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/map/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/sprite/*.cpp) \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ba5429fa..48468b421 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -947,8 +947,8 @@ SET(SRCS
     particle/imageparticle.h
     resources/sprite/imagesprite.cpp
     resources/sprite/imagesprite.h
-    inventory.cpp
-    inventory.h
+    resources/inventory/inventory.cpp
+    resources/inventory/inventory.h
     resources/item/item.cpp
     resources/item/item.h
     itemcolormanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index cf4280eca..00ad71036 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -717,8 +717,8 @@ manaplus_SOURCES += main.cpp \
 	      client.h \
 	      resources/sprite/imagesprite.cpp \
 	      resources/sprite/imagesprite.h \
-	      inventory.cpp \
-	      inventory.h \
+	      resources/inventory/inventory.cpp \
+	      resources/inventory/inventory.h \
 	      textcommand.cpp \
 	      textcommand.h \
 	      resources/item/item.cpp \
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 84001d989..95be13364 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -23,7 +23,6 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "game.h"
-#include "inventory.h"
 #include "party.h"
 
 #include "actions/actiondef.h"
@@ -64,6 +63,8 @@
 #include "resources/iteminfo.h"
 #include "resources/chatobject.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "utils/chatutils.h"
diff --git a/src/gui/shortcut/dropshortcut.cpp b/src/gui/shortcut/dropshortcut.cpp
index d0d85a253..380ff6a35 100644
--- a/src/gui/shortcut/dropshortcut.cpp
+++ b/src/gui/shortcut/dropshortcut.cpp
@@ -22,12 +22,13 @@
 
 #include "gui/shortcut/dropshortcut.h"
 
-#include "inventory.h"
 #include "settings.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "net/packetlimiter.h"
diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp
index d4c7874cf..7166fddf5 100644
--- a/src/gui/shortcut/itemshortcut.cpp
+++ b/src/gui/shortcut/itemshortcut.cpp
@@ -23,7 +23,6 @@
 #include "gui/shortcut/itemshortcut.h"
 
 #include "configuration.h"
-#include "inventory.h"
 #include "spellmanager.h"
 
 #include "being/playerinfo.h"
@@ -34,6 +33,8 @@
 
 #include "gui/windows/skilldialog.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/buyingstoreselldialog.cpp b/src/gui/windows/buyingstoreselldialog.cpp
index b9aad7e54..205734248 100644
--- a/src/gui/windows/buyingstoreselldialog.cpp
+++ b/src/gui/windows/buyingstoreselldialog.cpp
@@ -23,7 +23,6 @@
 #include "gui/windows/buyingstoreselldialog.h"
 
 #include "actormanager.h"
-#include "inventory.h"
 
 #include "being/playerinfo.h"
 
@@ -33,6 +32,8 @@
 
 #include "net/buyingstorehandler.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/shopitem.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 64e8cceb4..6c02e4304 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WINDOWS_INVENTORYWINDOW_H
 #define GUI_WINDOWS_INVENTORYWINDOW_H
 
-#include "inventory.h"
+#include "resources/inventory/inventory.h"
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 98a45effc..3ca9b8e35 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -23,7 +23,6 @@
 #include "gui/windows/ministatuswindow.h"
 
 #include "configuration.h"
-#include "inventory.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -42,6 +41,8 @@
 
 #include "net/playerhandler.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/sprite/animatedsprite.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 8034ef032..73cc5101d 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -25,7 +25,6 @@
 #include "configuration.h"
 #include "dragdrop.h"
 #include "game.h"
-#include "inventory.h"
 
 #include "being/playerinfo.h"
 
@@ -48,6 +47,8 @@
 
 #include "utils/gettext.h"
 
+#include "resources/inventory/inventory.h"
+
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index c6388c50e..7c75c4f92 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -60,7 +60,6 @@
 #include "soundmanager.h"
 #endif
 #include "configuration.h"
-#include "inventory.h"
 #include "settings.h"
 
 #include "being/localplayer.h"
@@ -86,6 +85,8 @@
 #include "resources/iteminfo.h"
 #endif
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/shopitem.h"
 
 #include <sys/stat.h>
diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp
index 11bec98fb..c4596f3ca 100644
--- a/src/net/ea/buysellrecv.cpp
+++ b/src/net/ea/buysellrecv.cpp
@@ -22,7 +22,6 @@
 
 #include "net/ea/buysellrecv.h"
 
-#include "inventory.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -39,6 +38,8 @@
 
 #include "net/messagein.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/buyingstorerecv.cpp b/src/net/eathena/buyingstorerecv.cpp
index e1be1b261..cdb38c04b 100644
--- a/src/net/eathena/buyingstorerecv.cpp
+++ b/src/net/eathena/buyingstorerecv.cpp
@@ -21,7 +21,6 @@
 #include "net/eathena/buyingstorerecv.h"
 
 #include "actormanager.h"
-#include "inventory.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
@@ -41,6 +40,8 @@
 
 #include "net/messagein.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/traderecv.cpp b/src/net/eathena/traderecv.cpp
index 59e63009d..97dc6affd 100644
--- a/src/net/eathena/traderecv.cpp
+++ b/src/net/eathena/traderecv.cpp
@@ -22,7 +22,6 @@
 
 #include "net/eathena/traderecv.h"
 
-#include "inventory.h"
 #include "itemcolormanager.h"
 #include "notifymanager.h"
 
@@ -36,6 +35,8 @@
 
 #include "net/ea/traderecv.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "debug.h"
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 4b052a4fb..2c18d4ead 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -23,7 +23,7 @@
 #ifndef NET_INVENTORYHANDLER_H
 #define NET_INVENTORYHANDLER_H
 
-#include "inventory.h"
+#include "resources/inventory/inventory.h"
 
 namespace Net
 {
diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp
index cc5a27014..48020eca3 100644
--- a/src/net/tmwa/traderecv.cpp
+++ b/src/net/tmwa/traderecv.cpp
@@ -22,7 +22,6 @@
 
 #include "net/tmwa/traderecv.h"
 
-#include "inventory.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -40,6 +39,8 @@
 
 #include "net/ea/traderecv.h"
 
+#include "resources/inventory/inventory.h"
+
 #include "resources/item/item.h"
 
 #include "utils/stringutils.h"
diff --git a/src/inventory.cpp b/src/resources/inventory/inventory.cpp
index 82674ef0f..ad44245a1 100644
--- a/src/inventory.cpp
+++ b/src/resources/inventory/inventory.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inventory.h"
+#include "resources/inventory/inventory.h"
 
 #include "logger.h"
 
diff --git a/src/inventory.h b/src/resources/inventory/inventory.h
index 0775655fc..501141ed8 100644
--- a/src/inventory.h
+++ b/src/resources/inventory/inventory.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INVENTORY_H
-#define INVENTORY_H
+#ifndef RESOURCES_INVENTORY_INVENTORY_H
+#define RESOURCES_INVENTORY_INVENTORY_H
 
 #include "enums/inventorytype.h"
 
@@ -200,4 +200,4 @@ class Inventory final
         int mUsed;      /**< THe number of slots in use */
 };
 
-#endif  // INVENTORY_H
+#endif  // RESOURCES_INVENTORY_INVENTORY_H