git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5985 54d463be-8e91-2dee-dedb-b68131a5f0ec
@@ -11,6 +11,7 @@
#include "../common/socket.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
+#include "../common/showmsg.h"
#include "log.h"
#include "clif.h"
@@ -26,7 +27,6 @@
#include "battle.h"
#include "charcommand.h"
#include "atcommand.h"
-#include "showmsg.h"
static char command_symbol = '#';
@@ -17,8 +17,11 @@
#include <limits.h>
#include "../common/malloc.h"
-#include "socket.h"
-#include "timer.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+
#include "map.h"
#include "chrif.h"
@@ -27,8 +30,6 @@
#include "npc.h"
#include "pc.h"
#include "status.h"
-#include "nullpo.h"
#ifndef TXT_ONLY
#include "charsave.h"
#endif
@@ -32,8 +32,8 @@ typedef int socklen_t;
#include "../common/mmo.h"
#include "../common/showmsg.h"
#include "../common/version.h"
#include "irc.h"
@@ -8,8 +8,8 @@
+#include "../common/grfio.h"
-#include "grfio.h"
#include "itemdb.h"
#include "script.h"
@@ -5,11 +5,12 @@
#include <stdlib.h>
#include <string.h>
-#include "db.h"
-#include "malloc.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
@@ -23,7 +24,6 @@
#include "skill.h"
#define MIN_PETTHINKTIME 100