From 75802940ea0f10c4ecce5ab55140c38a164ba574 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 29 Dec 2015 02:21:53 +0300 Subject: Move shopitem into item directory. --- src/net/buysellhandler.h | 2 +- src/net/eathena/buyingstorehandler.cpp | 4 ++-- src/net/eathena/markethandler.cpp | 4 ++-- src/net/eathena/npchandler.cpp | 4 ++-- src/net/eathena/vendinghandler.cpp | 4 ++-- src/net/eathena/vendingrecv.cpp | 3 ++- 6 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/net') diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index 7e7472ce6..48d76d67b 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -23,7 +23,7 @@ #ifndef NET_BUYSELLHANDLER_H #define NET_BUYSELLHANDLER_H -#include "shopitem.h" +#include "resources/item/shopitem.h" namespace Net { diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp index 8ff7f65bb..163e0bd79 100644 --- a/src/net/eathena/buyingstorehandler.cpp +++ b/src/net/eathena/buyingstorehandler.cpp @@ -20,8 +20,6 @@ #include "net/eathena/buyingstorehandler.h" -#include "shopitem.h" - #include "being/being.h" #include "being/playerinfo.h" @@ -30,6 +28,8 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" +#include "resources/item/shopitem.h" + #include "debug.h" extern Net::BuyingStoreHandler *buyingStoreHandler; diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp index 47aa05418..2f582c763 100644 --- a/src/net/eathena/markethandler.cpp +++ b/src/net/eathena/markethandler.cpp @@ -18,14 +18,14 @@ * along with this program. If not, see . */ -#include "shopitem.h" - #include "net/eathena/markethandler.h" #include "net/eathena/marketrecv.h" #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" +#include "resources/item/shopitem.h" + #include "debug.h" extern Net::MarketHandler *marketHandler; diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 5a267c25e..a55e59aa7 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -22,8 +22,6 @@ #include "net/eathena/npchandler.h" -#include "shopitem.h" - #include "being/localplayer.h" #include "const/net/inventory.h" @@ -39,6 +37,8 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" +#include "resources/item/shopitem.h" + #include "debug.h" extern Net::NpcHandler *npcHandler; diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp index 5a0661ae4..c448b627b 100644 --- a/src/net/eathena/vendinghandler.cpp +++ b/src/net/eathena/vendinghandler.cpp @@ -20,8 +20,6 @@ #include "net/eathena/vendinghandler.h" -#include "shopitem.h" - #include "being/being.h" #include "being/playerinfo.h" @@ -31,6 +29,8 @@ #include "net/eathena/protocolout.h" #include "net/eathena/vendingrecv.h" +#include "resources/item/shopitem.h" + #include "debug.h" extern Net::VendingHandler *vendingHandler; diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp index 146f2102e..8ba684e0c 100644 --- a/src/net/eathena/vendingrecv.cpp +++ b/src/net/eathena/vendingrecv.cpp @@ -22,7 +22,6 @@ #include "actormanager.h" #include "itemcolormanager.h" -#include "shopitem.h" #include "being/localplayer.h" #include "being/playerinfo.h" @@ -36,6 +35,8 @@ #include "net/messagein.h" +#include "resources/item/shopitem.h" + #include "debug.h" extern int packetVersion; -- cgit v1.2.3-60-g2f50