diff options
| author | Haru <haru@dotalux.com> | 2014-05-10 17:17:13 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-10 17:17:13 +0200 |
| commit | 0ab52ac65bdba93be94e4149e267698d31b41d72 (patch) | |
| tree | e7f0cd0d549c8a04a35693cc98b6b27c06eeb2ed /src/char/int_mercenary.c | |
| parent | 94657284973f4037596bae468ebfbee5c217e02b (diff) | |
| download | hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.gz hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.bz2 hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.xz hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.zip | |
Re-commit of "Fixed order of includes in all source files"
This reverts commit 94657284973f4037596bae468ebfbee5c217e02b.
Diffstat (limited to 'src/char/int_mercenary.c')
| -rw-r--r-- | src/char/int_mercenary.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c index aecb3844a..1dffb656c 100644 --- a/src/char/int_mercenary.c +++ b/src/char/int_mercenary.c @@ -2,20 +2,24 @@ // See the LICENSE file // Portions Copyright (c) Athena Dev Teams -#include "../common/mmo.h" -#include "../common/malloc.h" -#include "../common/strlib.h" -#include "../common/showmsg.h" -#include "../common/socket.h" -#include "../common/utils.h" -#include "../common/sql.h" -#include "char.h" -#include "inter.h" +#define HERCULES_CORE + +#include "int_mercenary.h" #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "char.h" +#include "inter.h" +#include "../common/malloc.h" +#include "../common/mmo.h" +#include "../common/showmsg.h" +#include "../common/socket.h" +#include "../common/sql.h" +#include "../common/strlib.h" +#include "../common/utils.h" + bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status) { char* data; |