diff options
Diffstat (limited to 'src/net/eathena')
39 files changed, 18 insertions, 157 deletions
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 69f03cc61..80263949d 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -22,15 +22,10 @@ #include "net/eathena/adminhandler.h" -#include "actorspritemanager.h" -#include "game.h" #include "notifications.h" #include "notifymanager.h" -#include "being/playerrelations.h" - -#include "net/chathandler.h" - +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include <string> diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 5e8250250..395510027 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_ADMINHANDLER_H #define NET_EATHENA_ADMINHANDLER_H -#include "net/adminhandler.h" -#include "net/net.h" - #include "net/ea/adminhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index bc4d6d442..1833c9a87 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -24,34 +24,24 @@ #include "actorspritemanager.h" #include "client.h" -#include "configuration.h" -#include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "party.h" #include "being/localplayer.h" -#include "being/playerrelations.h" #include "input/keyboardconfig.h" -#include "gui/botcheckerwindow.h" #include "gui/outfitwindow.h" #include "gui/socialwindow.h" #include "gui/killstats.h" -#include "utils/gettext.h" - -#include "net/playerhandler.h" - +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" -#include <iostream> - #include "debug.h" extern Net::BeingHandler *beingHandler; diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 50ffb1809..15a89d0b6 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_BEINGHANDLER_H #define NET_EATHENA_BEINGHANDLER_H -#include "net/beinghandler.h" -#include "net/net.h" - #include "net/ea/beinghandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 76f465872..44c8eb125 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -22,27 +22,15 @@ #include "net/eathena/buysellhandler.h" -#include "actorspritemanager.h" -#include "configuration.h" -#include "inventory.h" #include "notifications.h" #include "notifymanager.h" -#include "being/localplayer.h" #include "being/playerinfo.h" #include "gui/buydialog.h" -#include "gui/buyselldialog.h" -#include "gui/selldialog.h" -#include "gui/shopwindow.h" - -#include "gui/widgets/chattab.h" - -#include "net/chathandler.h" #include "net/ea/eaprotocol.h" -#include "net/eathena/chathandler.h" #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index ca3abfd09..fb584fb6a 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -23,8 +23,6 @@ #ifndef NET_EATHENA_BUYSELLHANDLER_H #define NET_EATHENA_BUYSELLHANDLER_H -#include "net/buysellhandler.h" - #include "net/ea/buysellhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 8c580ce3a..72b416319 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -25,16 +25,14 @@ #include "client.h" #include "configuration.h" -#include "gui/charcreatedialog.h" - #include "net/logindata.h" +#include "net/net.h" -#include "net/eathena/gamehandler.h" #include "net/eathena/loginhandler.h" +#include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 215e14235..49d384a93 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -23,16 +23,10 @@ #ifndef NET_EATHENA_CHARSERVERHANDLER_H #define NET_EATHENA_CHARSERVERHANDLER_H -#include "net/charserverhandler.h" - #include "net/ea/charserverhandler.h" #include "net/eathena/messagehandler.h" -#include "net/ea/token.h" - -class LoginData; - namespace EAthena { diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index ebcc900de..b0425e7b8 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -22,15 +22,7 @@ #include "net/eathena/chathandler.h" -#include "actorspritemanager.h" -#include "configuration.h" -#include "game.h" - #include "being/localplayer.h" -#include "being/playerrelations.h" - -#include "gui/chatwindow.h" -#include "gui/shopwindow.h" #include "gui/widgets/chattab.h" diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index e918fecc5..d97ca9d8d 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -23,12 +23,10 @@ #ifndef NET_EATHENA_CHATHANDLER_H #define NET_EATHENA_CHATHANDLER_H -#include "net/chathandler.h" -#include "net/net.h" - #include "net/ea/chathandler.h" #include "net/eathena/messagehandler.h" +#include "net/eathena/messageout.h" namespace EAthena { diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 9f501a4e0..f94bebde4 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -23,11 +23,13 @@ #include "net/eathena/gamehandler.h" #include "client.h" -#include "game.h" #include "being/localplayer.h" +#include "net/net.h" + #include "net/eathena/loginhandler.h" +#include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 49a21baf4..2c80496f3 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_GAMEHANDLER_H #define NET_EATHENA_GAMEHANDLER_H -#include "net/gamehandler.h" -#include "net/net.h" - #include "net/eathena/messagehandler.h" #include "net/ea/gamehandler.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 55b3b644f..4f1edd971 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -26,9 +26,7 @@ #include "configuration.h" #include "logger.h" -#include "gui/charselectdialog.h" #include "gui/inventorywindow.h" -#include "gui/registerdialog.h" #include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/statuswindow.h" @@ -55,13 +53,8 @@ #include "net/eathena/tradehandler.h" #include "net/eathena/skillhandler.h" -#include "net/eathena/gui/guildtab.h" -#include "net/eathena/gui/partytab.h" - #include "utils/gettext.h" -#include <list> - #include "debug.h" extern Net::GeneralHandler *generalHandler; diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index 3f817ab3a..0af154695 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -24,7 +24,6 @@ #define NET_EATHENA_GENERALHANDLER_H #include "net/generalhandler.h" -#include "net/net.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp index 542a9327b..01a10bd8a 100644 --- a/src/net/eathena/gui/guildtab.cpp +++ b/src/net/eathena/gui/guildtab.cpp @@ -22,19 +22,6 @@ #include "net/eathena/gui/guildtab.h" -#include "chatlogger.h" -#include "guild.h" - -#include "being/localplayer.h" - -#include "net/net.h" -#include "net/guildhandler.h" - -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - -#include "utils/gettext.h" - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp index 420e19fea..8b43b28aa 100644 --- a/src/net/eathena/gui/partytab.cpp +++ b/src/net/eathena/gui/partytab.cpp @@ -22,21 +22,6 @@ #include "net/eathena/gui/partytab.h" -#include "chatlogger.h" -#include "party.h" - -#include "being/localplayer.h" - -#include "net/net.h" -#include "net/partyhandler.h" - -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - -#include "utils/gettext.h" - -#include "net/chathandler.h" - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 22d6bc360..63b5aaea2 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -26,7 +26,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "net/eathena/messagein.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 4f3c3fa14..f0f6a6504 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -22,8 +22,6 @@ #ifndef NET_EATHENA_GUILDHANDLER_H #define NET_EATHENA_GUILDHANDLER_H -#include "net/guildhandler.h" - #include "net/ea/guildhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 11eb7fcf0..2bf70e00a 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -22,6 +22,7 @@ #include "net/eathena/inventoryhandler.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index d33771fb1..85c8ae8ab 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -23,10 +23,6 @@ #ifndef NET_EATHENA_INVENTORYHANDLER_H #define NET_EATHENA_INVENTORYHANDLER_H -#include "logger.h" - -#include "net/net.h" - #include "net/ea/inventoryhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 1ecfc2a51..a19a859ec 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -23,13 +23,12 @@ #include "net/eathena/loginhandler.h" #include "client.h" -#include "configuration.h" #include "logger.h" +#include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" -#include "utils/gettext.h" #include "utils/paths.h" #include "debug.h" diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 506b5b0a0..7c9b5eb61 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -31,8 +31,6 @@ #include <string> -class LoginData; - namespace EAthena { diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index aafac96ea..bc67f3246 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -25,10 +25,6 @@ #include "net/messagehandler.h" -#include "net/eathena/messageout.h" - -#include <SDL_types.h> - #include <memory> namespace EAthena diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp index 1acbd4665..221a782bb 100644 --- a/src/net/eathena/messagein.cpp +++ b/src/net/eathena/messagein.cpp @@ -28,7 +28,6 @@ #include "utils/stringutils.h" -#include <SDL.h> #include <SDL_endian.h> #include "debug.h" diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h index 49f8a36f1..a73e4c93b 100644 --- a/src/net/eathena/messagein.h +++ b/src/net/eathena/messagein.h @@ -25,9 +25,6 @@ #include "net/messagein.h" -#include <SDL_types.h> -#include <string> - #include "localconsts.h" namespace EAthena diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index 6dc2e00f4..1ca2311ff 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -28,7 +28,6 @@ #include "logger.h" -#include <SDL.h> #include <SDL_endian.h> #include <cstring> diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index 0e8364131..d41d48e49 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -25,9 +25,6 @@ #include "net/messageout.h" -#include <iosfwd> -#include <SDL_types.h> - #include "localconsts.h" namespace EAthena diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 198c61bd4..24c3a70fa 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -22,16 +22,11 @@ #include "net/eathena/network.h" -#include "configuration.h" #include "logger.h" +#include "net/eathena/messagein.h" #include "net/eathena/protocol.h" -#include "utils/gettext.h" - -#include <assert.h> -#include <sstream> - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index ea7a5506d..041c9889a 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -26,7 +26,6 @@ #include "net/ea/network.h" #include "net/eathena/messagehandler.h" -#include "net/eathena/messagein.h" /** * Protocol version, reported to the eAthena char and mapserver who can adjust diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index ea480103e..b0066b561 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -25,14 +25,12 @@ #include "being/localplayer.h" #include "gui/npcdialog.h" -#include "gui/viewport.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" -#include "utils/langs.h" - #include "debug.h" extern Net::NpcHandler *npcHandler; diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index e48c0e8ab..a993982bc 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -23,17 +23,10 @@ #ifndef NET_EATHENA_NPCHANDLER_H #define NET_EATHENA_NPCHANDLER_H -#include "net/net.h" -#include "net/npchandler.h" - #include "net/ea/npchandler.h" #include "net/eathena/messagehandler.h" -#include <map> - -class NpcDialog; - namespace EAthena { diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index 27b228a7b..2508c8556 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -27,10 +27,9 @@ #include "being/localplayer.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "net/eathena/gui/partytab.h" - #include "debug.h" extern Net::PartyHandler *partyHandler; diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index 3a75fefd3..e52f763ec 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -22,7 +22,6 @@ #ifndef NET_EATHENA_PARTYHANDLER_H #define NET_EATHENA_PARTYHANDLER_H -#include "net/net.h" #include "net/partyhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 00234bd7c..aac729040 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -22,15 +22,12 @@ #include "net/eathena/playerhandler.h" -#include "configuration.h" -#include "client.h" +#include "net/net.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "net/eathena/npchandler.h" #include "net/eathena/inventoryhandler.h" -#include "gui/whoisonline.h" - #include "debug.h" extern Net::PlayerHandler *playerHandler; diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index 4e82d7067..2de4c148e 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_PLAYERHANDLER_H #define NET_EATHENA_PLAYERHANDLER_H -#include "net/net.h" -#include "net/playerhandler.h" - #include "net/ea/playerhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index e14d89e4e..0d654bbc8 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -22,8 +22,7 @@ #include "net/eathena/skillhandler.h" -#include "logger.h" - +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h index 2680d2c56..c404527c8 100644 --- a/src/net/eathena/skillhandler.h +++ b/src/net/eathena/skillhandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_SKILLHANDLER_H #define NET_EATHENA_SKILLHANDLER_H -#include "net/net.h" -#include "net/skillhandler.h" - #include "net/ea/skillhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 3698153da..f495e618f 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -26,6 +26,7 @@ #include "being/playerinfo.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h index 22a8401c9..58e7b97f6 100644 --- a/src/net/eathena/tradehandler.h +++ b/src/net/eathena/tradehandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_TRADEHANDLER_H #define NET_EATHENA_TRADEHANDLER_H -#include "net/net.h" -#include "net/tradehandler.h" - #include "net/ea/tradehandler.h" #include "net/eathena/messagehandler.h" |