diff options
Diffstat (limited to 'src/net/ea')
44 files changed, 53 insertions, 231 deletions
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index d73019467..6815164c4 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -22,15 +22,9 @@ #include "net/ea/adminhandler.h" -#include "notifymanager.h" - -#include "enums/resources/notifytypes.h" - #include "gui/chatconsts.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/serverfeatures.h" #include "utils/stringutils.h" diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index bf8ad7b06..9849f4e31 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -27,11 +27,6 @@ #include "localconsts.h" -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/adminrecv.h b/src/net/ea/adminrecv.h index 47da05c59..159cc94ea 100644 --- a/src/net/ea/adminrecv.h +++ b/src/net/ea/adminrecv.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NET_EA_ADMIN_H -#define NET_EA_ADMIN_H +#ifndef NET_EA_ADMINRECV_H +#define NET_EA_ADMINRECV_H #include "localconsts.h" @@ -38,4 +38,4 @@ namespace Ea } // namespace Admin } // namespace Ea -#endif // NET_EA_ADMIN_H +#endif // NET_EA_ADMINRECV_H diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 56fea0fc7..a1a8dfabb 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -22,24 +22,6 @@ #include "net/ea/beinghandler.h" -#include "actormanager.h" -#include "game.h" -#include "party.h" - -#include "being/localplayer.h" -#include "being/playerrelation.h" -#include "being/playerrelations.h" - -#include "enums/resources/map/mapitemtype.h" - -#include "gui/viewport.h" - -#include "gui/windows/socialwindow.h" - -#include "resources/map/map.h" - -#include "net/serverfeatures.h" - #include "net/ea/beingrecv.h" #include "debug.h" diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp index 047b77653..72111e4e1 100644 --- a/src/net/ea/beingrecv.cpp +++ b/src/net/ea/beingrecv.cpp @@ -38,6 +38,7 @@ #include "resources/map/map.h" +#include "net/messagein.h" #include "net/serverfeatures.h" #include "debug.h" diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h index 0fb51ebe7..9b77ce714 100644 --- a/src/net/ea/beingrecv.h +++ b/src/net/ea/beingrecv.h @@ -20,10 +20,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NET_EA_BEING_H -#define NET_EA_BEING_H +#ifndef NET_EA_BEINGRECV_H +#define NET_EA_BEINGRECV_H -#include "net/beinghandler.h" +#include "enums/simpletypes/beingid.h" +#include "enums/simpletypes/itemcolor.h" + +#include <string> + +namespace Net +{ + class MessageIn; +} + +class Being; namespace Ea { @@ -51,9 +61,6 @@ namespace Ea const bool isWeapon = false, const bool isTempSprite = false); } // namespace Being - } // namespace Ea -//extern bool Ea::BeingRecv::mSync; - -#endif // NET_EA_BEING_H +#endif // NET_EA_BEINGRECV_H diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 0b8734d49..f8d0ba84f 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -22,21 +22,7 @@ #include "net/ea/buysellhandler.h" -#include "inventory.h" -#include "notifymanager.h" - -#include "being/playerinfo.h" - -#include "enums/resources/notifytypes.h" - -#include "gui/windows/buydialog.h" -#include "gui/windows/buyselldialog.h" -#include "gui/windows/npcselldialog.h" - -#include "gui/widgets/createwidget.h" - #include "net/ea/buysellrecv.h" -#include "net/ea/eaprotocol.h" #include "debug.h" diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 2afc82ee0..bfc8219d0 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -25,8 +25,6 @@ #include "net/buysellhandler.h" -class BuyDialog; - namespace Ea { diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp index 14fa812f0..e49305a7f 100644 --- a/src/net/ea/buysellrecv.cpp +++ b/src/net/ea/buysellrecv.cpp @@ -35,6 +35,8 @@ #include "gui/widgets/createwidget.h" +#include "net/buysellhandler.h" + #include "net/ea/eaprotocol.h" #include "debug.h" diff --git a/src/net/ea/buysellrecv.h b/src/net/ea/buysellrecv.h index 1b6cd4518..e8b771856 100644 --- a/src/net/ea/buysellrecv.h +++ b/src/net/ea/buysellrecv.h @@ -23,7 +23,12 @@ #ifndef NET_EA_BUYSELLRECV_H #define NET_EA_BUYSELLRECV_H -#include "net/buysellhandler.h" +#include "enums/simpletypes/beingid.h" + +namespace Net +{ + class MessageIn; +} class BuyDialog; diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index e46562085..0983a2007 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -22,20 +22,11 @@ #include "net/ea/charserverhandler.h" -#include "client.h" - -#include "gui/windows/charcreatedialog.h" -#include "gui/windows/okdialog.h" - -#include "gui/widgets/createwidget.h" +#include "net/serverinfo.h" #include "net/ea/eaprotocol.h" -#include "net/character.h" -#include "net/messagein.h" - #include "utils/dtor.h" -#include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/charserverrecv.cpp b/src/net/ea/charserverrecv.cpp index 8435f0caf..7b04c05b0 100644 --- a/src/net/ea/charserverrecv.cpp +++ b/src/net/ea/charserverrecv.cpp @@ -29,12 +29,10 @@ #include "gui/widgets/createwidget.h" -#include "net/ea/eaprotocol.h" - #include "net/character.h" +#include "net/charserverhandler.h" #include "net/messagein.h" -#include "utils/dtor.h" #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/charserverrecv.h b/src/net/ea/charserverrecv.h index 8f5d233c5..0d2c4c27a 100644 --- a/src/net/ea/charserverrecv.h +++ b/src/net/ea/charserverrecv.h @@ -23,8 +23,6 @@ #ifndef NET_EA_CHARSERVERRECV_H #define NET_EA_CHARSERVERRECV_H -#include "net/charserverhandler.h" - namespace Net { class MessageIn; diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index fd47bc48f..aa2377c7b 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -22,24 +22,10 @@ #include "net/ea/chathandler.h" -#include "actormanager.h" #include "configuration.h" -#include "notifymanager.h" - -#include "being/being.h" - -#include "enums/resources/notifytypes.h" - -#include "gui/windows/chatwindow.h" - -#include "gui/widgets/tabs/chat/chattab.h" - -#include "net/messagein.h" #include "net/ea/chatrecv.h" -#include "utils/gettext.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index a71f63e83..87dd4f2c3 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -27,11 +27,6 @@ #include <queue> -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/chatrecv.cpp b/src/net/ea/chatrecv.cpp index 3f11ab0e1..9c7e5ccdd 100644 --- a/src/net/ea/chatrecv.cpp +++ b/src/net/ea/chatrecv.cpp @@ -78,7 +78,7 @@ std::string ChatRecv::getLastWhisperNick() } void ChatRecv::processWhisperResponseContinue(Net::MessageIn &msg, - const uint8_t type) + const uint8_t type) { const std::string nick = getPopLastWhisperNick(); switch (type) diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index c84f38b62..c01bd7fe9 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -23,8 +23,7 @@ #ifndef NET_EA_CHATRECV_H #define NET_EA_CHATRECV_H -#include "net/chathandler.h" - +#include <string> #include <queue> namespace Net diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 4f8734e92..fb8e76832 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -22,22 +22,10 @@ #include "net/ea/gamehandler.h" -#include "client.h" #include "game.h" -#include "notifymanager.h" - -#include "enums/resources/notifytypes.h" - -#include "gui/windows/okdialog.h" - -#include "gui/widgets/createwidget.h" - -#include "net/messagein.h" #include "net/ea/gamerecv.h" -#include "utils/gettext.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 17834b333..9a6c1aeae 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -23,15 +23,8 @@ #ifndef NET_EA_GAMEHANDLER_H #define NET_EA_GAMEHANDLER_H -#include "enums/simpletypes/beingid.h" - #include "net/gamehandler.h" -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/gamerecv.cpp b/src/net/ea/gamerecv.cpp index 73fe3a01e..3a85e54a9 100644 --- a/src/net/ea/gamerecv.cpp +++ b/src/net/ea/gamerecv.cpp @@ -23,7 +23,6 @@ #include "net/ea/gamerecv.h" #include "client.h" -#include "game.h" #include "notifymanager.h" #include "enums/resources/notifytypes.h" @@ -45,7 +44,7 @@ namespace GameRecv { std::string mMap; BeingId mCharID = BeingId_zero; -} // namespace GameRev +} // namespace GameRecv void GameRecv::processWhoAnswer(Net::MessageIn &msg) { diff --git a/src/net/ea/gamerecv.h b/src/net/ea/gamerecv.h index a35b13825..7b127df7e 100644 --- a/src/net/ea/gamerecv.h +++ b/src/net/ea/gamerecv.h @@ -25,7 +25,7 @@ #include "enums/simpletypes/beingid.h" -#include "net/gamehandler.h" +#include <string> namespace Net { diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 2bc7ba02d..739e42940 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -21,26 +21,11 @@ #include "net/ea/guildhandler.h" -#include "actormanager.h" -#include "notifymanager.h" - -#include "being/localplayer.h" -#include "being/playerinfo.h" - -#include "enums/resources/notifytypes.h" - -#include "gui/windows/skilldialog.h" -#include "gui/windows/socialwindow.h" - -#include "net/messagein.h" - #include "net/ea/guildrecv.h" #include "gui/widgets/tabs/chat/guildtab.h" #include "utils/delete2.h" -#include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index a03ff5b64..93cb4a597 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -24,11 +24,6 @@ #include "net/guildhandler.h" -namespace Net -{ - class MessageIn; -} - class GuildTab; namespace Ea diff --git a/src/net/ea/guildrecv.cpp b/src/net/ea/guildrecv.cpp index a28818924..504895c54 100644 --- a/src/net/ea/guildrecv.cpp +++ b/src/net/ea/guildrecv.cpp @@ -22,6 +22,7 @@ #include "net/ea/guildrecv.h" #include "actormanager.h" +#include "guild.h" #include "notifymanager.h" #include "being/localplayer.h" diff --git a/src/net/ea/guildrecv.h b/src/net/ea/guildrecv.h index 542243c83..efdb7289d 100644 --- a/src/net/ea/guildrecv.h +++ b/src/net/ea/guildrecv.h @@ -22,14 +22,14 @@ #ifndef NET_EA_GUILDRECV_H #define NET_EA_GUILDRECV_H -#include "net/guildhandler.h" +#include <string> namespace Net { class MessageIn; } -class GuildTab; +class Guild; namespace Ea { diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index e4409278c..8d3ad6c9f 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -22,26 +22,11 @@ #include "net/ea/inventoryhandler.h" -#include "notifymanager.h" - -#include "being/localplayer.h" - -#include "enums/equipslot.h" - -#include "enums/resources/notifytypes.h" - -#include "gui/widgets/createwidget.h" - -#include "net/messagein.h" - -#include "net/ea/eaprotocol.h" #include "net/ea/equipbackend.h" #include "net/ea/inventoryrecv.h" #include "utils/delete2.h" -#include "listeners/arrowslistener.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 3883ab0d4..ffac7e282 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -33,17 +33,9 @@ #include <queue> -namespace Net -{ - class MessageIn; -} - namespace Ea { -class EquipBackend; - -typedef std::vector<InventoryItem> InventoryItems; typedef std::queue<BeingId> PickupQueue; class InventoryHandler notfinal : public Net::InventoryHandler diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h index d4d9c3637..4b18a542b 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -35,6 +35,8 @@ #include <stdint.h> #endif +#include <vector> + #include "localconsts.h" namespace Ea @@ -87,6 +89,8 @@ class InventoryItem final } }; +typedef std::vector<InventoryItem> InventoryItems; + } // namespace Ea #endif // NET_EA_INVENTORYITEM_H diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index 810743d26..e7c1afb62 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -32,6 +32,7 @@ #include "gui/widgets/createwidget.h" +#include "net/inventoryhandler.h" #include "net/messagein.h" #include "net/ea/eaprotocol.h" @@ -79,7 +80,7 @@ namespace InventoryRecv Inventory *mStorage = nullptr; PickupQueue mSentPickups; bool mDebugInventory = true; -} +} // namespace InventoryRecv void InventoryRecv::processPlayerInventoryRemove(Net::MessageIn &msg) { diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h index b5ba2a4df..a55d88716 100644 --- a/src/net/ea/inventoryrecv.h +++ b/src/net/ea/inventoryrecv.h @@ -27,8 +27,6 @@ #include "enums/simpletypes/beingid.h" -#include "net/inventoryhandler.h" - #include "net/ea/inventoryitem.h" #include <queue> @@ -38,12 +36,12 @@ namespace Net class MessageIn; } +class Inventory; + namespace Ea { - class EquipBackend; - typedef std::vector<InventoryItem> InventoryItems; typedef std::queue<BeingId> PickupQueue; namespace InventoryRecv diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index 19b1e919d..61ec35f96 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -22,12 +22,6 @@ #include "net/ea/itemhandler.h" -#include "actormanager.h" - -#include "net/messagein.h" - -#include "net/ea/itemrecv.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index f8365990b..687f81d81 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -25,11 +25,6 @@ #include "localconsts.h" -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 0958434f0..e87650a29 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -24,18 +24,12 @@ #include "client.h" #include "configuration.h" +#include "logger.h" #include "settings.h" -#include "being/being.h" - -#include "gui/windows/logindialog.h" - #include "utils/dtor.h" -#include "utils/gettext.h" -#include "utils/paths.h" #include "net/logindata.h" -#include "net/messagein.h" #include "net/ea/loginrecv.h" #include "net/ea/token.h" diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 9dc559dab..b4a36a4fa 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -31,11 +31,6 @@ class LoginData; struct Token; -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp index e3430bac8..6ebfa90c8 100644 --- a/src/net/ea/loginrecv.cpp +++ b/src/net/ea/loginrecv.cpp @@ -24,17 +24,16 @@ #include "client.h" #include "configuration.h" -#include "settings.h" #include "being/being.h" #include "gui/windows/logindialog.h" -#include "utils/dtor.h" #include "utils/gettext.h" #include "utils/paths.h" #include "net/logindata.h" +#include "net/loginhandler.h" #include "net/messagein.h" #include "net/ea/token.h" diff --git a/src/net/ea/loginrecv.h b/src/net/ea/loginrecv.h index 07e2f14bf..2f2c509a3 100644 --- a/src/net/ea/loginrecv.h +++ b/src/net/ea/loginrecv.h @@ -23,13 +23,13 @@ #ifndef NET_EA_LOGINRECV_H #define NET_EA_LOGINRECV_H -#include "net/loginhandler.h" +#include "net/worldinfo.h" -#include "net/registrationoptions.h" +#include "net/ea/token.h" -class LoginData; +#include <string> -struct Token; +class LoginData; namespace Net { diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 78ed6de53..237c4e749 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -22,16 +22,8 @@ #include "net/ea/npchandler.h" -#include "gui/viewport.h" - -#include "gui/windows/npcdialog.h" - -#include "net/messagein.h" - #include "net/ea/npcrecv.h" -#include "utils/langs.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 98321d29f..4a33062ec 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -27,13 +27,6 @@ #include "localconsts.h" -class NpcDialog; - -namespace Net -{ - class MessageIn; -} - namespace Ea { diff --git a/src/net/ea/npcrecv.cpp b/src/net/ea/npcrecv.cpp index 08d0ed498..e38a06531 100644 --- a/src/net/ea/npcrecv.cpp +++ b/src/net/ea/npcrecv.cpp @@ -27,6 +27,7 @@ #include "gui/windows/npcdialog.h" #include "net/messagein.h" +#include "net/npchandler.h" #include "utils/langs.h" diff --git a/src/net/ea/npcrecv.h b/src/net/ea/npcrecv.h index eb1808465..26e626d85 100644 --- a/src/net/ea/npcrecv.h +++ b/src/net/ea/npcrecv.h @@ -23,8 +23,6 @@ #ifndef NET_EA_NPCRECV_H #define NET_EA_NPCRECV_H -#include "net/npchandler.h" - #include "localconsts.h" class NpcDialog; diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 0797e6e55..4ffbc27ef 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -21,20 +21,8 @@ #include "net/ea/partyhandler.h" -#include "actormanager.h" -#include "configuration.h" -#include "notifymanager.h" #include "party.h" -#include "being/localplayer.h" - -#include "enums/resources/notifytypes.h" - -#include "gui/windows/chatwindow.h" -#include "gui/windows/socialwindow.h" - -#include "net/messagein.h" - #include "net/ea/partyrecv.h" #include "gui/widgets/tabs/chat/partytab.h" diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 1848d5316..2dc8e5c87 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -26,11 +26,6 @@ class Party; -namespace Net -{ - class MessageIn; -} - namespace Ea { class PartyHandler notfinal : public Net::PartyHandler diff --git a/src/net/ea/partyrecv.cpp b/src/net/ea/partyrecv.cpp index 415129f41..99b746e5b 100644 --- a/src/net/ea/partyrecv.cpp +++ b/src/net/ea/partyrecv.cpp @@ -61,8 +61,8 @@ void PartyRecv::processPartyCreate(Net::MessageIn &msg) } void PartyRecv::processPartySettingsContinue(Net::MessageIn &msg, - const PartyShareT exp, - const PartyShareT item) + const PartyShareT exp, + const PartyShareT item) { switch (exp) { diff --git a/src/net/ea/partyrecv.h b/src/net/ea/partyrecv.h index 87452318f..d80be62dc 100644 --- a/src/net/ea/partyrecv.h +++ b/src/net/ea/partyrecv.h @@ -22,7 +22,7 @@ #ifndef NET_EA_PARTYRECV_H #define NET_EA_PARTYRECV_H -#include "net/partyhandler.h" +#include "enums/net/partyshare.h" class Party; |