diff options
Diffstat (limited to 'src/net')
82 files changed, 10 insertions, 238 deletions
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index 8a49a68cd..3fbcbe733 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -25,7 +25,6 @@ #include "net/messagein.h" -#include "being.h" #include "shopitem.h" namespace Net diff --git a/src/net/download.cpp b/src/net/download.cpp index a0d7dbe25..5d35e1ace 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -25,8 +25,6 @@ #include "logger.h" #include "main.h" -#include "utils/stringutils.h" - #include <curl/curl.h> #include <SDL.h> diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index f70be3cc8..3a7501fb6 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -23,7 +23,6 @@ #include "net/ea/adminhandler.h" #include "net/chathandler.h" -#include "net/net.h" #include <string> diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 765cbc651..5a3ca3cc7 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -25,15 +25,14 @@ #include "net/ea/eaprotocol.h" #include "actorspritemanager.h" -#include "being.h" #include "client.h" #include "effectmanager.h" +#include "game.h" #include "guild.h" #include "guildmanager.h" #include "inputmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "party.h" #include "playerrelations.h" #include "configuration.h" @@ -44,10 +43,8 @@ #include "gui/killstats.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/playerhandler.h" -#include "net/net.h" #include "resources/colordb.h" #include "resources/itemdb.h" diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 46292bae5..d9080b969 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -23,13 +23,12 @@ #include "net/ea/buysellhandler.h" #include "actorspritemanager.h" +#include "client.h" #include "configuration.h" #include "depricatedevent.h" #include "inventory.h" -#include "item.h" #include "localplayer.h" #include "playerinfo.h" -#include "shopitem.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" @@ -39,8 +38,6 @@ #include "gui/widgets/chattab.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/net.h" #include "utils/gettext.h" diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 942ba79a6..62c9090e9 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -23,13 +23,10 @@ #include "net/ea/charserverhandler.h" #include "client.h" -#include "logger.h" #include "gui/charcreatedialog.h" #include "gui/okdialog.h" -#include "net/net.h" - #include "net/ea/loginhandler.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index bec8d2011..c0978157c 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -26,7 +26,6 @@ #include "net/charhandler.h" #include "net/messagein.h" #include "net/net.h" -#include "net/serverinfo.h" class LoginData; diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index d44830644..0ab2c903c 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -23,12 +23,10 @@ #include "net/ea/chathandler.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "guildmanager.h" #include "localplayer.h" #include "playerrelations.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" @@ -36,7 +34,6 @@ #include "gui/widgets/chattab.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 69f4089ad..1cb105204 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -23,15 +23,11 @@ #include "net/ea/gamehandler.h" #include "client.h" -#include "depricatedevent.h" #include "game.h" #include "localplayer.h" -#include "logger.h" #include "gui/okdialog.h" -#include "net/messagein.h" - #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 3ab6a48eb..b41e69418 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -34,14 +34,10 @@ #include "net/ea/guildhandler.h" -#include "net/guildhandler.h" - #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 0e3b51928..edbd867d9 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -36,9 +36,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/chathandler.h" diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 7c2361531..fb14540cb 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -22,10 +22,7 @@ #include "net/ea/guildhandler.h" #include "actorspritemanager.h" -#include "depricatedevent.h" -#include "guild.h" #include "localplayer.h" -#include "logger.h" #include "gui/socialwindow.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index b194afd0d..6a4818129 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -22,20 +22,18 @@ #include "net/ea/inventoryhandler.h" -#include "inventory.h" #include "localplayer.h" -#include "logger.h" #include "gui/ministatuswindow.h" -#include "net/messagein.h" - #include "net/ea/eaprotocol.h" #include "utils/gettext.h" #include "debug.h" +extern int serverVersion; + const Equipment::Slot EQUIP_POINTS[Equipment::EQUIP_VECTOREND] = { Equipment::EQUIP_LEGS_SLOT, diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index b868b5dfa..15c2e0994 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -26,14 +26,11 @@ #include "equipment.h" #include "inventory.h" #include "localconsts.h" -#include "logger.h" #include "playerinfo.h" #include "gui/inventorywindow.h" -#include "net/inventoryhandler.h" #include "net/messagein.h" -#include "net/net.h" #include <vector> #include <queue> diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index dcc17421f..f4954d3d5 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -24,8 +24,6 @@ #include "actorspritemanager.h" -#include "net/messagein.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 2a7afb189..18cc26351 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -23,8 +23,8 @@ #include "net/ea/loginhandler.h" #include "client.h" -#include "logger.h" #include "configuration.h" +#include "logger.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index ccf126a22..fc50c0971 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -26,12 +26,10 @@ #include "logger.h" #include "net/messagehandler.h" -#include "net/messagein.h" #include "net/eathena/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <assert.h> #include <sstream> diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 18b0ca39a..9ce72fd96 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -24,9 +24,6 @@ #include "gui/npcdialog.h" -#include "net/messagein.h" -#include "net/net.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 68d712db1..fa853bb4b 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -23,14 +23,9 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" #include "gui/socialwindow.h" -#include "net/messagein.h" - -#include "net/ea/gui/partytab.h" - #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 130b31046..aa998158c 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,10 +22,9 @@ #include "net/ea/playerhandler.h" +#include "game.h" #include "localplayer.h" -#include "logger.h" #include "party.h" -#include "playerinfo.h" #include "units.h" #include "gui/ministatuswindow.h" @@ -34,7 +33,6 @@ #include "gui/statuswindow.h" #include "gui/viewport.h" -#include "net/messagein.h" #include "net/npchandler.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index 7a760c5b4..7db3f1b31 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -30,7 +30,6 @@ #include "gui/widgets/chattab.h" -#include "net/messagein.h" #include "net/messageout.h" #include "utils/gettext.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 80104ea67..fb49bdc62 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -33,7 +33,6 @@ #include "gui/tradewindow.h" #include "net/inventoryhandler.h" -#include "net/messagein.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 0ff3aa03d..56b636b3b 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -22,22 +22,16 @@ #include "net/eathena/adminhandler.h" -#include "net/ea/adminhandler.h" - #include "actorspritemanager.h" -#include "being.h" #include "depricatedevent.h" #include "game.h" -#include "logger.h" #include "playerrelations.h" #include "net/chathandler.h" -#include "net/net.h" #include "net/eathena/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 9cd7fdeaf..1af410632 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -23,14 +23,12 @@ #include "net/eathena/beinghandler.h" #include "actorspritemanager.h" -#include "being.h" #include "client.h" #include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "party.h" #include "playerrelations.h" #include "configuration.h" @@ -41,10 +39,8 @@ #include "gui/killstats.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/playerhandler.h" -#include "net/net.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 785338373..405d5f7ec 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -26,10 +26,8 @@ #include "configuration.h" #include "depricatedevent.h" #include "inventory.h" -#include "item.h" #include "localplayer.h" #include "playerinfo.h" -#include "shopitem.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" @@ -39,8 +37,6 @@ #include "gui/widgets/chattab.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index b3440454e..499ec691e 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -27,10 +27,6 @@ #include "net/ea/buysellhandler.h" -#include "being.h" - -#include "net/net.h" - #include "net/eathena/messagehandler.h" namespace EAthena diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 085767a46..512300704 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -24,13 +24,10 @@ #include "client.h" #include "configuration.h" -#include "logger.h" #include "gui/charcreatedialog.h" #include "net/logindata.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/eathena/gamehandler.h" #include "net/eathena/loginhandler.h" diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 28b43cba5..f276b6346 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -27,8 +27,6 @@ #include "net/ea/charserverhandler.h" -#include "net/serverinfo.h" - #include "net/eathena/messagehandler.h" #include "net/ea/token.h" diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index 05e98daad..756faf6f3 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -23,22 +23,17 @@ #include "net/eathena/chathandler.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "depricatedevent.h" #include "game.h" #include "localplayer.h" #include "playerrelations.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" #include "gui/widgets/chattab.h" -#include "net/messagein.h" -#include "net/messageout.h" - #include "net/eathena/protocol.h" #include <string> diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 387768227..09e6e4121 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -23,13 +23,8 @@ #include "net/eathena/gamehandler.h" #include "client.h" -#include "depricatedevent.h" #include "game.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" -#include "net/messageout.h" #include "net/eathena/loginhandler.h" #include "net/eathena/network.h" diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index a1f6c46e7..97df941ee 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -25,7 +25,6 @@ #include "net/gamehandler.h" #include "net/net.h" -#include "net/serverinfo.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 76bb2cb36..82c52e943 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -33,13 +33,8 @@ #include "gui/socialwindow.h" #include "gui/statuswindow.h" -#include "net/messagein.h" -#include "net/messageout.h" -#include "net/serverinfo.h" - #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/eathena/adminhandler.h" @@ -63,8 +58,6 @@ #include "net/eathena/gui/guildtab.h" #include "net/eathena/gui/partytab.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" #include <list> diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp index 33b29db65..387cb9446 100644 --- a/src/net/eathena/gui/guildtab.cpp +++ b/src/net/eathena/gui/guildtab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp index 8435f1c57..57a0bf8c1 100644 --- a/src/net/eathena/gui/partytab.cpp +++ b/src/net/eathena/gui/partytab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/chathandler.h" diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 6b8db8983..719d82163 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -23,7 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "net/eathena/messagein.h" diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 186d1f630..ab9ef3c77 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -26,8 +26,6 @@ #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" - #include "net/eathena/messagehandler.h" namespace EAthena diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index b7841f940..9f4b18ab2 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -22,10 +22,6 @@ #include "net/eathena/inventoryhandler.h" -#include "logger.h" - -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp index 814e3c76e..8eedb8562 100644 --- a/src/net/eathena/itemhandler.cpp +++ b/src/net/eathena/itemhandler.cpp @@ -22,8 +22,6 @@ #include "net/eathena/itemhandler.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 68555d7c5..1aeef1c09 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -23,10 +23,8 @@ #include "net/eathena/loginhandler.h" #include "client.h" -#include "logger.h" #include "configuration.h" - -#include "net/messagein.h" +#include "logger.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 602518782..ec7713eca 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -29,8 +29,6 @@ #include "net/eathena/messagehandler.h" -#include "net/ea/token.h" - #include <string> class LoginData; diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index f494c5181..a8dfa1b5b 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -24,7 +24,6 @@ #define NET_EATHENA_MESSAGEHANDLER_H #include "net/messagehandler.h" -#include "net/messagein.h" #include "net/eathena/messageout.h" diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index a486a02f5..26261aaa5 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -28,8 +28,6 @@ #include "logger.h" -#include "utils/stringutils.h" - #include <SDL.h> #include <SDL_endian.h> diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 67018e7b5..236d80310 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -25,13 +25,9 @@ #include "configuration.h" #include "logger.h" -#include "net/messagehandler.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <assert.h> #include <sstream> diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index 0ce8591ff..3c8ab2a65 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -25,11 +25,8 @@ #include "net/ea/network.h" -#include "net/serverinfo.h" - #include "net/eathena/messagehandler.h" #include "net/eathena/messagein.h" -#include "net/eathena/messageout.h" #include <SDL_net.h> #include <SDL_thread.h> diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 3166a49cb..aa141e089 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -27,10 +27,6 @@ #include "gui/npcdialog.h" #include "gui/viewport.h" -#include "net/messagein.h" -#include "net/net.h" -#include "net/npchandler.h" - #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index 2f525c9d5..04de35890 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -23,9 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index b39f17a33..1054f6d2d 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -29,8 +29,6 @@ #include "net/ea/partyhandler.h" -#include "party.h" - namespace EAthena { diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 1054cd877..d9bb8c3b5 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -24,9 +24,6 @@ #include "configuration.h" #include "client.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/eathena/protocol.h" #include "net/eathena/npchandler.h" diff --git a/src/net/eathena/specialhandler.cpp b/src/net/eathena/specialhandler.cpp index f2f969ff7..77bb5a1d2 100644 --- a/src/net/eathena/specialhandler.cpp +++ b/src/net/eathena/specialhandler.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 66bb20b29..a9416f8cd 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -23,11 +23,8 @@ #include "net/eathena/tradehandler.h" #include "item.h" -#include "logger.h" #include "playerinfo.h" -#include "net/messagein.h" - #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h index 9864ba654..57b49b13b 100644 --- a/src/net/generalhandler.h +++ b/src/net/generalhandler.h @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "client.h" -#include "main.h" - #ifndef GENERALHANDLER_H #define GENERALHANDLER_H diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 642d6f1c1..5d6062710 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -23,7 +23,6 @@ #ifndef INVENTORYHANDLER_H #define INVENTORYHANDLER_H -#include "inventory.h" #include "item.h" #include <iosfwd> diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 377cca6d3..ca1d86881 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -27,8 +27,6 @@ #include "logger.h" #include "net.h" -#include "utils/stringutils.h" - #include "debug.h" #define MAKEWORD(low, high) \ diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 3b7ed813f..ae45d44d6 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -22,22 +22,16 @@ #include "net/tmwa/adminhandler.h" -#include "net/ea/adminhandler.h" - #include "actorspritemanager.h" -#include "being.h" #include "depricatedevent.h" #include "game.h" -#include "logger.h" #include "playerrelations.h" #include "net/chathandler.h" -#include "net/net.h" #include "net/tmwa/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <string> diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index dc815bf1c..9a2827ee5 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -23,14 +23,12 @@ #include "net/tmwa/beinghandler.h" #include "actorspritemanager.h" -#include "being.h" #include "client.h" #include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" #include "party.h" #include "playerrelations.h" #include "configuration.h" @@ -41,10 +39,8 @@ #include "gui/killstats.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/playerhandler.h" -#include "net/net.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index aa0a07d9d..5a3877734 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -26,10 +26,8 @@ #include "configuration.h" #include "depricatedevent.h" #include "inventory.h" -#include "item.h" #include "localplayer.h" #include "playerinfo.h" -#include "shopitem.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" @@ -39,8 +37,6 @@ #include "gui/widgets/chattab.h" #include "net/chathandler.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/ea/eaprotocol.h" @@ -52,6 +48,7 @@ #include "debug.h" extern Net::BuySellHandler *buySellHandler; +extern int serverVersion; namespace TmwAthena { diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index e4d07511f..69188099f 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -27,10 +27,6 @@ #include "net/ea/buysellhandler.h" -#include "being.h" - -#include "net/net.h" - #include "net/tmwa/messagehandler.h" namespace TmwAthena diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 0a660a79d..777abc54e 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -24,13 +24,10 @@ #include "client.h" #include "configuration.h" -#include "logger.h" #include "gui/charcreatedialog.h" #include "net/logindata.h" -#include "net/messagein.h" -#include "net/net.h" #include "net/tmwa/gamehandler.h" #include "net/tmwa/loginhandler.h" diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 915c6dba5..7a6629237 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -27,8 +27,6 @@ #include "net/ea/charserverhandler.h" -#include "net/serverinfo.h" - #include "net/tmwa/messagehandler.h" #include "net/ea/token.h" diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 81c7ea5b6..6b695c1ee 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -23,22 +23,17 @@ #include "net/tmwa/chathandler.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "depricatedevent.h" #include "game.h" #include "localplayer.h" #include "playerrelations.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/shopwindow.h" #include "gui/widgets/chattab.h" -#include "net/messagein.h" -#include "net/messageout.h" - #include "net/tmwa/protocol.h" #include <string> diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index a6096d4d9..15a4477ff 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -23,13 +23,8 @@ #include "net/tmwa/gamehandler.h" #include "client.h" -#include "depricatedevent.h" #include "game.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" -#include "net/messageout.h" #include "net/tmwa/loginhandler.h" #include "net/tmwa/network.h" diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 455ec3646..8f399d230 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -25,7 +25,6 @@ #include "net/gamehandler.h" #include "net/net.h" -#include "net/serverinfo.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index c5ca7b529..2a38fcefe 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -33,13 +33,8 @@ #include "gui/socialwindow.h" #include "gui/statuswindow.h" -#include "net/messagein.h" -#include "net/messageout.h" -#include "net/serverinfo.h" - #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/tmwa/adminhandler.h" @@ -64,8 +59,6 @@ #include "net/tmwa/gui/guildtab.h" #include "net/tmwa/gui/partytab.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" #include <list> diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 496ba64f5..752a33746 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 02bcfd54f..40ed53fcf 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -35,9 +35,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "net/chathandler.h" diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 8bd8e9754..e57ae8e98 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -23,7 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" #include "playerinfo.h" #include "net/tmwa/messagein.h" diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index e1d2d7c29..cb149655c 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -26,8 +26,6 @@ #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" - #include "net/tmwa/messagehandler.h" namespace TmwAthena diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 9977df34d..5838bae1c 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -22,10 +22,6 @@ #include "net/tmwa/inventoryhandler.h" -#include "logger.h" - -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index 58c564d77..4e6a9bfa1 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -22,8 +22,6 @@ #include "net/tmwa/itemhandler.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 67c6aa932..d95cbfe54 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -23,10 +23,8 @@ #include "net/tmwa/loginhandler.h" #include "client.h" -#include "logger.h" #include "configuration.h" - -#include "net/messagein.h" +#include "logger.h" #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index b27b0af77..ecd9d2428 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -29,8 +29,6 @@ #include "net/tmwa/messagehandler.h" -#include "net/ea/token.h" - #include <string> class LoginData; diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index 7607e5c80..930fe4858 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -24,7 +24,6 @@ #define NET_TA_MESSAGEHANDLER_H #include "net/messagehandler.h" -#include "net/messagein.h" #include "net/tmwa/messageout.h" diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index 1ceb806be..1c802d3e8 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -28,8 +28,6 @@ #include "logger.h" -#include "utils/stringutils.h" - #include <SDL.h> #include <SDL_endian.h> diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 0492f6609..aab05c7b9 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -25,13 +25,9 @@ #include "configuration.h" #include "logger.h" -#include "net/messagehandler.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <assert.h> #include <sstream> diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index b110b7fb9..57fa339e1 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -25,11 +25,8 @@ #include "net/ea/network.h" -#include "net/serverinfo.h" - #include "net/tmwa/messagehandler.h" #include "net/tmwa/messagein.h" -#include "net/tmwa/messageout.h" #include <SDL_net.h> #include <SDL_thread.h> diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 6cd02c6e2..d68a78c8c 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -27,10 +27,6 @@ #include "gui/npcdialog.h" #include "gui/viewport.h" -#include "net/messagein.h" -#include "net/net.h" -#include "net/npchandler.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" @@ -40,6 +36,7 @@ #include "debug.h" extern Net::NpcHandler *npcHandler; +extern int serverVersion; namespace TmwAthena { diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 74826e5cd..8a59f2a48 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -23,9 +23,6 @@ #include "actorspritemanager.h" #include "localplayer.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index eb3f68a70..c4d20b353 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -29,8 +29,6 @@ #include "net/ea/partyhandler.h" -#include "party.h" - namespace TmwAthena { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index ce0ce4019..4549234f4 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -24,9 +24,6 @@ #include "configuration.h" #include "client.h" -#include "logger.h" - -#include "net/messagein.h" #include "net/tmwa/protocol.h" #include "net/tmwa/npchandler.h" diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp index 68ab75806..759037bb5 100644 --- a/src/net/tmwa/questhandler.cpp +++ b/src/net/tmwa/questhandler.cpp @@ -24,9 +24,6 @@ #include "gui/questswindow.h" -#include "net/messagein.h" -#include "net/net.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index 8033d7a1d..58424cadc 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index f572e6cff..14614e62d 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -23,11 +23,8 @@ #include "net/tmwa/tradehandler.h" #include "item.h" -#include "logger.h" #include "playerinfo.h" -#include "net/messagein.h" - #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" |