summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/adminhandler.cpp6
-rw-r--r--src/net/eathena/beinghandler.cpp4
-rw-r--r--src/net/eathena/buysellhandler.cpp4
-rw-r--r--src/net/eathena/buysellhandler.h4
-rw-r--r--src/net/eathena/charserverhandler.cpp3
-rw-r--r--src/net/eathena/charserverhandler.h2
-rw-r--r--src/net/eathena/chathandler.cpp5
-rw-r--r--src/net/eathena/gamehandler.cpp5
-rw-r--r--src/net/eathena/gamehandler.h1
-rw-r--r--src/net/eathena/generalhandler.cpp7
-rw-r--r--src/net/eathena/gui/guildtab.cpp2
-rw-r--r--src/net/eathena/gui/partytab.cpp2
-rw-r--r--src/net/eathena/guildhandler.cpp1
-rw-r--r--src/net/eathena/guildhandler.h2
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
-rw-r--r--src/net/eathena/itemhandler.cpp2
-rw-r--r--src/net/eathena/loginhandler.cpp4
-rw-r--r--src/net/eathena/loginhandler.h2
-rw-r--r--src/net/eathena/messagehandler.h1
-rw-r--r--src/net/eathena/messageout.cpp2
-rw-r--r--src/net/eathena/network.cpp4
-rw-r--r--src/net/eathena/network.h3
-rw-r--r--src/net/eathena/npchandler.cpp4
-rw-r--r--src/net/eathena/partyhandler.cpp3
-rw-r--r--src/net/eathena/partyhandler.h2
-rw-r--r--src/net/eathena/playerhandler.cpp3
-rw-r--r--src/net/eathena/specialhandler.cpp2
-rw-r--r--src/net/eathena/tradehandler.cpp3
28 files changed, 1 insertions, 86 deletions
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"