diff options
| author | Happy <markaizer@gmail.com> | 2014-08-21 04:50:46 +0800 |
|---|---|---|
| committer | Happy <markaizer@gmail.com> | 2014-08-21 04:50:46 +0800 |
| commit | f52e1007fe08c67003c0bc4c78231904dd3fd5cc (patch) | |
| tree | 99907d827264e501774e58ab4630e41fa7103c02 /src/char/int_mercenary.c | |
| parent | 2410110dece79b4598c12f1c953219f1d0d1904a (diff) | |
| parent | 769b1d05aa5cfa8cddfe7d21b35d5c5e4da3bbd6 (diff) | |
| download | hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.gz hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.bz2 hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.xz hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.zip | |
Merge pull request #1 from HerculesWS/master
Update from original
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; |