From bc1d286cc71a7ae82d9639f4a832970a287c0d71 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Fri, 16 May 2014 17:34:16 +0200
Subject: Follow-up to b6b3f58795288701d0e162d43fa6f0a47af913b3
- Includes in some files weren't sorted alphabetically. Special thanks
to KeiKun.
Signed-off-by: Haru <haru@dotalux.com>
---
src/map/atcommand.c | 2 +-
src/map/battleground.c | 2 +-
src/map/map.h | 4 ++--
src/map/script.c | 2 +-
src/map/script.h | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'src/map')
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 96fa9c350..4a183ded4 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <string.h>
+#include "HPMmap.h"
#include "battle.h"
#include "chat.h"
#include "chrif.h"
@@ -54,7 +55,6 @@
#include "../common/sysinfo.h"
#include "../common/timer.h"
#include "../common/utils.h"
-#include "HPMmap.h"
struct atcommand_interface atcommand_s;
diff --git a/src/map/battleground.c b/src/map/battleground.c
index a7169de0e..4558f32c3 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -6,8 +6,8 @@
#include "battleground.h"
-#include <string.h>
#include <stdio.h>
+#include <string.h>
#include "battle.h"
#include "clif.h"
diff --git a/src/map/map.h b/src/map/map.h
index 099370b7a..3ce59a804 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -10,9 +10,9 @@
#include "atcommand.h"
#include "../common/cbasetypes.h"
#include "../common/core.h" // CORE_ST_LAST
-#include "../common/mmo.h"
-#include "../common/mapindex.h"
#include "../common/db.h"
+#include "../common/mapindex.h"
+#include "../common/mmo.h"
#include "../common/sql.h"
struct mob_data;
diff --git a/src/map/script.c b/src/map/script.c
index b432e6720..404079126 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include "atcommand.h"
#include "battle.h"
@@ -58,7 +59,6 @@
#ifndef WIN32
#include <sys/time.h>
#endif
-#include <time.h>
static inline int GETVALUE(const unsigned char* buf, int i) {
return (int)MakeDWord(MakeWord(buf[i], buf[i+1]), MakeWord(buf[i+2], 0));
diff --git a/src/map/script.h b/src/map/script.h
index 899c745da..bb6cd6e11 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -5,8 +5,8 @@
#ifndef _MAP_SCRIPT_H_
#define _MAP_SCRIPT_H_
-#include <setjmp.h>
#include <errno.h>
+#include <setjmp.h>
#include "map.h" //EVENT_NAME_LENGTH
#include "../common/cbasetypes.h"
--
cgit v1.2.3-70-g09d2