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.h | |
| 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.h')
| -rw-r--r-- | src/char/int_mercenary.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h index 01e4a841f..b03c20de3 100644 --- a/src/char/int_mercenary.h +++ b/src/char/int_mercenary.h @@ -1,10 +1,12 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_MERCENARY_SQL_H_ -#define _INT_MERCENARY_SQL_H_ +#ifndef CHAR_INT_MERCENARY_H +#define CHAR_INT_MERCENARY_H -struct s_mercenary; +#include "../common/cbasetypes.h" + +struct mmo_charstatus; int inter_mercenary_sql_init(void); void inter_mercenary_sql_final(void); @@ -17,4 +19,4 @@ bool mercenary_owner_delete(int char_id); bool mapif_mercenary_delete(int merc_id); -#endif /* _INT_MERCENARY_SQL_H_ */ +#endif /* CHAR_INT_MERCENARY_H */ |