From 00cda69b883d6354f093be6ee39a7936cb798979 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 31 Aug 2013 22:42:10 +0300 Subject: move being related files into being dir. --- src/net/beinghandler.h | 3 ++- src/net/charserverhandler.h | 4 ++-- src/net/ea/beinghandler.cpp | 7 ++++--- src/net/ea/buysellhandler.cpp | 5 +++-- src/net/ea/buysellhandler.h | 2 +- src/net/ea/chathandler.cpp | 5 +++-- src/net/ea/gamehandler.cpp | 3 ++- src/net/ea/gui/guildtab.cpp | 3 ++- src/net/ea/gui/partytab.cpp | 3 ++- src/net/ea/guildhandler.cpp | 3 ++- src/net/ea/inventoryhandler.cpp | 3 ++- src/net/ea/inventoryhandler.h | 3 ++- src/net/ea/partyhandler.cpp | 3 ++- src/net/ea/playerhandler.cpp | 3 ++- src/net/ea/skillhandler.cpp | 5 +++-- src/net/ea/token.h | 2 +- src/net/ea/tradehandler.cpp | 5 +++-- src/net/eathena/adminhandler.cpp | 3 ++- src/net/eathena/beinghandler.cpp | 7 ++++--- src/net/eathena/buysellhandler.cpp | 5 +++-- src/net/eathena/chathandler.cpp | 5 +++-- src/net/eathena/gamehandler.cpp | 3 ++- src/net/eathena/gui/guildtab.cpp | 3 ++- src/net/eathena/gui/partytab.cpp | 3 ++- src/net/eathena/guildhandler.cpp | 5 +++-- src/net/eathena/npchandler.cpp | 2 +- src/net/eathena/partyhandler.cpp | 3 ++- src/net/eathena/tradehandler.cpp | 3 ++- src/net/logindata.h | 2 +- src/net/playerhandler.h | 5 +++-- src/net/tmwa/adminhandler.cpp | 3 ++- src/net/tmwa/beinghandler.cpp | 7 ++++--- src/net/tmwa/buysellhandler.cpp | 5 +++-- src/net/tmwa/chathandler.cpp | 5 +++-- src/net/tmwa/gamehandler.cpp | 3 ++- src/net/tmwa/gui/guildtab.cpp | 3 ++- src/net/tmwa/gui/partytab.cpp | 3 ++- src/net/tmwa/guildhandler.cpp | 5 +++-- src/net/tmwa/npchandler.cpp | 2 +- src/net/tmwa/partyhandler.cpp | 3 ++- src/net/tmwa/questhandler.cpp | 2 +- src/net/tmwa/tradehandler.cpp | 3 ++- src/net/tradehandler.h | 2 +- 43 files changed, 96 insertions(+), 61 deletions(-) (limited to 'src/net') diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index 31a31fcc2..cf5b285b1 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -22,7 +22,8 @@ #ifndef NET_BEINGHANDLER_H #define NET_BEINGHANDLER_H -#include "being.h" +#include "being/being.h" + #include "net/messagein.h" namespace Net diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 2dee5c05e..aa05ba7f5 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -23,8 +23,8 @@ #ifndef NET_CHARSERVERHANDLER_H #define NET_CHARSERVERHANDLER_H -#include "localplayer.h" -#include "playerinfo.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" #include #include diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 3dee60dfa..7c5c2598c 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -26,14 +26,15 @@ #include "actorspritemanager.h" #include "client.h" +#include "configuration.h" #include "effectmanager.h" #include "game.h" #include "guild.h" #include "guildmanager.h" -#include "localplayer.h" #include "party.h" -#include "playerrelations.h" -#include "configuration.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "particle/particle.h" diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 6a68355dd..892422f76 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -26,9 +26,10 @@ #include "client.h" #include "configuration.h" #include "inventory.h" -#include "localplayer.h" #include "notifymanager.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 8cb4b2951..f46a8dcb4 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -25,7 +25,7 @@ #include "net/buysellhandler.h" -#include "being.h" +#include "being/being.h" #include "net/net.h" diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 72a1e49b7..c8259bc91 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -25,9 +25,10 @@ #include "actorspritemanager.h" #include "configuration.h" #include "guildmanager.h" -#include "localplayer.h" #include "notifymanager.h" -#include "playerrelations.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index df2c4ec47..1909cd6df 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -24,9 +24,10 @@ #include "client.h" #include "game.h" -#include "localplayer.h" #include "notifymanager.h" +#include "being/localplayer.h" + #include "gui/okdialog.h" #include "debug.h" diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 802236212..615d0334b 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -25,10 +25,11 @@ #include "chatlogger.h" #include "configuration.h" #include "guild.h" -#include "localplayer.h" #include "soundconsts.h" #include "soundmanager.h" +#include "being/localplayer.h" + #include "net/net.h" #include "net/ea/guildhandler.h" diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index d21e82d20..c41fad098 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -24,11 +24,12 @@ #include "chatlogger.h" #include "commandhandler.h" -#include "localplayer.h" #include "party.h" #include "soundconsts.h" #include "soundmanager.h" +#include "being/localplayer.h" + #include "net/net.h" #include "net/partyhandler.h" diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index e19b44592..4dc0f7f6e 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -23,9 +23,10 @@ #include "actorspritemanager.h" #include "configuration.h" -#include "localplayer.h" #include "notifymanager.h" +#include "being/localplayer.h" + #include "gui/socialwindow.h" #include "debug.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 65f0d87a0..d2bcd6a23 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -22,9 +22,10 @@ #include "net/ea/inventoryhandler.h" -#include "localplayer.h" #include "notifymanager.h" +#include "being/localplayer.h" + #include "gui/ministatuswindow.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index b21ba2fbc..7c3af78ec 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -26,7 +26,8 @@ #include "equipment.h" #include "inventory.h" #include "localconsts.h" -#include "playerinfo.h" + +#include "being/playerinfo.h" #include "gui/inventorywindow.h" diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 7eee0d4e7..0a87bf370 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -23,9 +23,10 @@ #include "actorspritemanager.h" #include "configuration.h" -#include "localplayer.h" #include "notifymanager.h" +#include "being/localplayer.h" + #include "gui/socialwindow.h" #include "debug.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 2d477ad4a..5106e0ecc 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -23,11 +23,12 @@ #include "net/ea/playerhandler.h" #include "game.h" -#include "localplayer.h" #include "party.h" #include "notifymanager.h" #include "units.h" +#include "being/localplayer.h" + #include "gui/ministatuswindow.h" #include "gui/okdialog.h" #include "gui/npcdialog.h" diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp index 68597dd85..e363385e1 100644 --- a/src/net/ea/skillhandler.cpp +++ b/src/net/ea/skillhandler.cpp @@ -23,9 +23,10 @@ #include "net/ea/skillhandler.h" #include "logger.h" -#include "localplayer.h" #include "notifymanager.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/skilldialog.h" diff --git a/src/net/ea/token.h b/src/net/ea/token.h index c358ef8a7..0de35d379 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -20,7 +20,7 @@ * along with this program. If not, see . */ -#include "being.h" +#include "being/being.h" #ifndef NET_EA_TOKEN_H #define NET_EA_TOKEN_H diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 4fa92e7d8..d22bf71ea 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -26,8 +26,9 @@ #include "item.h" #include "logger.h" #include "notifymanager.h" -#include "playerinfo.h" -#include "playerrelations.h" + +#include "being/playerinfo.h" +#include "being/playerrelations.h" #include "gui/confirmdialog.h" #include "gui/tradewindow.h" diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 4661cd5b8..e52945a98 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -25,7 +25,8 @@ #include "actorspritemanager.h" #include "game.h" #include "notifymanager.h" -#include "playerrelations.h" + +#include "being/playerrelations.h" #include "net/chathandler.h" diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 68c3f1a02..bc4d6d442 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -24,13 +24,14 @@ #include "actorspritemanager.h" #include "client.h" +#include "configuration.h" #include "effectmanager.h" #include "guild.h" #include "guildmanager.h" -#include "localplayer.h" #include "party.h" -#include "playerrelations.h" -#include "configuration.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "input/keyboardconfig.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 0b1c4ad06..8b44ac409 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -25,9 +25,10 @@ #include "actorspritemanager.h" #include "configuration.h" #include "inventory.h" -#include "localplayer.h" #include "notifymanager.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index eae8e7ffc..ebcc900de 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -25,8 +25,9 @@ #include "actorspritemanager.h" #include "configuration.h" #include "game.h" -#include "localplayer.h" -#include "playerrelations.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 4b9bcb80f..9f501a4e0 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -24,7 +24,8 @@ #include "client.h" #include "game.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/eathena/loginhandler.h" #include "net/eathena/network.h" diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp index f946e1f8e..542a9327b 100644 --- a/src/net/eathena/gui/guildtab.cpp +++ b/src/net/eathena/gui/guildtab.cpp @@ -24,7 +24,8 @@ #include "chatlogger.h" #include "guild.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/net.h" #include "net/guildhandler.h" diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp index 157869a96..420e19fea 100644 --- a/src/net/eathena/gui/partytab.cpp +++ b/src/net/eathena/gui/partytab.cpp @@ -23,9 +23,10 @@ #include "net/eathena/gui/partytab.h" #include "chatlogger.h" -#include "localplayer.h" #include "party.h" +#include "being/localplayer.h" + #include "net/net.h" #include "net/partyhandler.h" diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 5deb326fa..22d6bc360 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -22,8 +22,9 @@ #include "net/eathena/guildhandler.h" #include "actorspritemanager.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "net/eathena/messagein.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 2543c3b41..ea480103e 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -22,7 +22,7 @@ #include "net/eathena/npchandler.h" -#include "localplayer.h" +#include "being/localplayer.h" #include "gui/npcdialog.h" #include "gui/viewport.h" diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index 26e5ed981..e00fd4119 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -22,9 +22,10 @@ #include "net/eathena/partyhandler.h" #include "actorspritemanager.h" -#include "localplayer.h" #include "notifymanager.h" +#include "being/localplayer.h" + #include "net/eathena/protocol.h" #include "net/eathena/gui/partytab.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index df0364af5..3698153da 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -23,7 +23,8 @@ #include "net/eathena/tradehandler.h" #include "item.h" -#include "playerinfo.h" + +#include "being/playerinfo.h" #include "net/eathena/protocol.h" diff --git a/src/net/logindata.h b/src/net/logindata.h index abe6b6ee7..9964c9842 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -23,7 +23,7 @@ #ifndef NET_LOGINDATA_H #define NET_LOGINDATA_H -#include "being.h" +#include "being/being.h" #include diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 7c20224ac..3bb1df208 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -23,9 +23,10 @@ #ifndef NET_PLAYERHANDLER_H #define NET_PLAYERHANDLER_H -#include "being.h" #include "flooritem.h" -#include "playerinfo.h" + +#include "being/being.h" +#include "being/playerinfo.h" namespace Net { diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index c156b9f51..1c48284b7 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -25,7 +25,8 @@ #include "actorspritemanager.h" #include "game.h" #include "notifymanager.h" -#include "playerrelations.h" + +#include "being/playerrelations.h" #include "net/chathandler.h" diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index dea944932..678be6cc4 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -24,13 +24,14 @@ #include "actorspritemanager.h" #include "client.h" +#include "configuration.h" #include "effectmanager.h" #include "guild.h" #include "guildmanager.h" -#include "localplayer.h" #include "party.h" -#include "playerrelations.h" -#include "configuration.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "input/keyboardconfig.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 8bb426bef..46a95b44d 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -25,9 +25,10 @@ #include "actorspritemanager.h" #include "configuration.h" #include "inventory.h" -#include "localplayer.h" #include "notifymanager.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 8c455a186..aeea1b58e 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -25,8 +25,9 @@ #include "actorspritemanager.h" #include "configuration.h" #include "game.h" -#include "localplayer.h" -#include "playerrelations.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index b066db36b..57771559d 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -24,7 +24,8 @@ #include "client.h" #include "game.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/tmwa/loginhandler.h" #include "net/tmwa/network.h" diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 08a42eadc..cc907295f 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -24,7 +24,8 @@ #include "chatlogger.h" #include "guild.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/net.h" #include "net/guildhandler.h" diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 348e5cbfb..e0c28ab4a 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -23,9 +23,10 @@ #include "net/tmwa/gui/partytab.h" #include "chatlogger.h" -#include "localplayer.h" #include "party.h" +#include "being/localplayer.h" + #include "net/net.h" #include "net/partyhandler.h" diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 6761105e1..73b82bfbc 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -22,8 +22,9 @@ #include "net/tmwa/guildhandler.h" #include "actorspritemanager.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "net/tmwa/messagein.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index e22036619..2f4fc2e70 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -22,7 +22,7 @@ #include "net/tmwa/npchandler.h" -#include "localplayer.h" +#include "being/localplayer.h" #include "gui/npcdialog.h" #include "gui/viewport.h" diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 39a580ebf..1b29cde46 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -22,9 +22,10 @@ #include "net/tmwa/partyhandler.h" #include "actorspritemanager.h" -#include "localplayer.h" #include "notifymanager.h" +#include "being/localplayer.h" + #include "net/tmwa/protocol.h" #include "net/tmwa/gui/partytab.h" diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp index 378f53f97..9a5f52330 100644 --- a/src/net/tmwa/questhandler.cpp +++ b/src/net/tmwa/questhandler.cpp @@ -20,7 +20,7 @@ #include "net/tmwa/questhandler.h" -#include "localplayer.h" +#include "being/localplayer.h" #include "gui/skilldialog.h" #include "gui/questswindow.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 33c08382e..3d49a63d0 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -23,7 +23,8 @@ #include "net/tmwa/tradehandler.h" #include "item.h" -#include "playerinfo.h" + +#include "being/playerinfo.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index f896e190c..801eba9c1 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -23,7 +23,7 @@ #ifndef NET_TRADEHANDLER_H #define NET_TRADEHANDLER_H -#include "being.h" +#include "being/being.h" #include -- cgit v1.2.3-60-g2f50