summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-07 14:48:13 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-07 14:49:00 +0300
commit45c769b20e3b59446b58e182988547e6fe8507e0 (patch)
tree50fafe4c54174ea4e9d855561d6c2e66f9f90986 /src/net
parentc3aced619b00d5053b8c5f3aab050f704466dada (diff)
downloadplus-45c769b20e3b59446b58e182988547e6fe8507e0.tar.gz
plus-45c769b20e3b59446b58e182988547e6fe8507e0.tar.bz2
plus-45c769b20e3b59446b58e182988547e6fe8507e0.tar.xz
plus-45c769b20e3b59446b58e182988547e6fe8507e0.zip
Move invetory into inventory directory.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/buysellrecv.cpp3
-rw-r--r--src/net/eathena/buyingstorerecv.cpp3
-rw-r--r--src/net/eathena/traderecv.cpp3
-rw-r--r--src/net/inventoryhandler.h2
-rw-r--r--src/net/tmwa/traderecv.cpp3
5 files changed, 9 insertions, 5 deletions
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"