diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:12:07 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:12:07 -0700 |
| commit | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (patch) | |
| tree | d9b013ab252968ec1e90e721f7b2ab819af0acb0 /src/tool/marriage-info.c | |
| parent | 5939e1bec75f2550d3ce109b9cd9a5d22c0626c2 (diff) | |
| parent | 723fb5d3431b847526c433a13aa74485cfb564a3 (diff) | |
| download | tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.gz tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.bz2 tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.xz tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.zip | |
Merge commit '723fb5d3431b847526c433a13aa74485cfb564a3'
Diffstat (limited to 'src/tool/marriage-info.c')
| -rw-r--r-- | src/tool/marriage-info.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/tool/marriage-info.c b/src/tool/marriage-info.c index cd13843..4d7cbc3 100644 --- a/src/tool/marriage-info.c +++ b/src/tool/marriage-info.c @@ -7,9 +7,10 @@ src/char/int_party.o src/char/int_storage.o src/char/inter.o #include <stdio.h> #include <stdlib.h> -#include "login.h" -#include "mmo.h" -#include "char.c" +#include "../login/login.h" +#include "../common/mmo.h" +// Yes, this is intentional +#include "../char/char.c" int mode; #define MODE_MARRIED 0 @@ -442,7 +443,6 @@ int mmo_char_dump() mmo_check_dumpworthy(&char_dat); } } - fcloseall(); return 0; } @@ -480,7 +480,3 @@ int main(int argc,char *argv[]) return 0; } - - -/* satisfy linker */ -void set_termfunc(void (*termfunc)(void)) {}; |