summaryrefslogtreecommitdiff
path: root/src/net/manaserv/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/manaserv/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/manaserv/generalhandler.cpp')
-rw-r--r--src/net/manaserv/generalhandler.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 96a6750d..79eb59ef 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -21,6 +21,8 @@
#include "net/manaserv/generalhandler.h"
+#include "main.h"
+
#include "gui/changeemaildialog.h"
#include "gui/charselectdialog.h"
#include "gui/inventorywindow.h"
@@ -30,19 +32,18 @@
#include "gui/specialswindow.h"
#include "gui/statuswindow.h"
-#include "net/manaserv/network.h"
-#include "net/manaserv/connection.h"
-
#include "net/manaserv/beinghandler.h"
#include "net/manaserv/buysellhandler.h"
#include "net/manaserv/charhandler.h"
#include "net/manaserv/chathandler.h"
+#include "net/manaserv/connection.h"
#include "net/manaserv/effecthandler.h"
#include "net/manaserv/gamehandler.h"
#include "net/manaserv/guildhandler.h"
#include "net/manaserv/inventoryhandler.h"
#include "net/manaserv/itemhandler.h"
#include "net/manaserv/loginhandler.h"
+#include "net/manaserv/network.h"
#include "net/manaserv/npchandler.h"
#include "net/manaserv/partyhandler.h"
#include "net/manaserv/playerhandler.h"
@@ -51,8 +52,6 @@
#include "utils/gettext.h"
-#include "main.h"
-
#include <list>
extern Net::GeneralHandler *generalHandler;