summaryrefslogtreecommitdiff
path: root/src/net/ea/generalhandler.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-12 14:19:47 -0700
committerJared <jaxad0127@gmail.com>2010-01-12 14:41:34 -0700
commit1420656e08f65f3e5c963f82b10a718b8026d216 (patch)
tree262441cb8f9587b982f9078398844021c0d22de0 /src/net/ea/generalhandler.cpp
parentd18b9fb1aa086d3ed0187d61940564f197411cf4 (diff)
downloadMana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.gz
Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.bz2
Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.xz
Mana-1420656e08f65f3e5c963f82b10a718b8026d216.zip
Standardize header order
Also remove some extra new lines and fix eAthena's PartyTab define guards.
Diffstat (limited to 'src/net/ea/generalhandler.cpp')
-rw-r--r--src/net/ea/generalhandler.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 5c7c5036..677b2aa5 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -21,15 +21,16 @@
#include "net/ea/generalhandler.h"
+#include "configuration.h"
+#include "log.h"
+#include "main.h"
+
#include "gui/charselectdialog.h"
#include "gui/inventorywindow.h"
#include "gui/register.h"
#include "gui/skilldialog.h"
#include "gui/statuswindow.h"
-#include "net/ea/network.h"
-#include "net/ea/protocol.h"
-
#include "net/ea/adminhandler.h"
#include "net/ea/beinghandler.h"
#include "net/ea/buysellhandler.h"
@@ -39,9 +40,11 @@
#include "net/ea/inventoryhandler.h"
#include "net/ea/itemhandler.h"
#include "net/ea/loginhandler.h"
+#include "net/ea/network.h"
#include "net/ea/npchandler.h"
-#include "net/ea/playerhandler.h"
#include "net/ea/partyhandler.h"
+#include "net/ea/playerhandler.h"
+#include "net/ea/protocol.h"
#include "net/ea/tradehandler.h"
#include "net/ea/specialhandler.h"
@@ -52,10 +55,6 @@
#include "resources/itemdb.h"
-#include "configuration.h"
-#include "log.h"
-#include "main.h"
-
#include "utils/gettext.h"
#include <assert.h>