diff options
| author | Haru <haru@dotalux.com> | 2014-05-16 17:34:16 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-16 17:34:16 +0200 |
| commit | bc1d286cc71a7ae82d9639f4a832970a287c0d71 (patch) | |
| tree | e17c392fa7994068148a5567f872797f5e5d9e48 /src/map | |
| parent | d350bfeb9cc310ec329d968fc57bf4183b7cb527 (diff) | |
| download | hercules-bc1d286cc71a7ae82d9639f4a832970a287c0d71.tar.gz hercules-bc1d286cc71a7ae82d9639f4a832970a287c0d71.tar.bz2 hercules-bc1d286cc71a7ae82d9639f4a832970a287c0d71.tar.xz hercules-bc1d286cc71a7ae82d9639f4a832970a287c0d71.zip | |
Follow-up to b6b3f58795288701d0e162d43fa6f0a47af913b3
- Includes in some files weren't sorted alphabetically. Special thanks
to KeiKun.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battleground.c | 2 | ||||
| -rw-r--r-- | src/map/map.h | 4 | ||||
| -rw-r--r-- | src/map/script.c | 2 | ||||
| -rw-r--r-- | src/map/script.h | 2 |
5 files changed, 6 insertions, 6 deletions
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" |