diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-20 11:09:36 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-20 11:09:36 +0000 |
| commit | 5245e666a09df5f401c1329bf5ee1fc1b09b1d16 (patch) | |
| tree | dcf032743e890fddd400b268b75a0868976b0a0b /src/char/inter.c | |
| parent | d23c508bcc38520970156e5e25f14b03714878eb (diff) | |
| download | hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.tar.gz hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.tar.bz2 hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.tar.xz hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.zip | |
* Merged the tmpsql branch:
- Abstraction for the sql code (sql.c/h).
- New configure script and makefiles.
- Restored txt zeny logging code. (r10814)
- Rewrote mapserver's sql code - itemdb, mobdb, mapreg, logs. (r10814)
- Fixed a precedence issue (&& and ) in char_sql/char.c. (r10833)
- Improved db reading code a bit for consistency. (r11077)
- Added separate atcommand for mail deletion. (r11077)
- Corrected a few messages that said "new" instead of "unread". (r11077)
- Broadcast (*) messages now use "*" as the target's name (not ""). (r11077)
- Moved StringBuf code from utils.c/h to strlib.c/h. (r11084 r11117)
- Some misc login server cleanups (reformatting etc). (r11136)
- Corrected/modified some header entries. (r11141 r11147 11148)
- Adjusted VS project files. (r11147)
- Adjusted the way the sql charserver does item saving. (r11192)
- Corrected usage of reserved keyword 'friend' in mmo.h. (r11192)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11245 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char/inter.c')
| -rw-r--r-- | src/char/inter.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/char/inter.c b/src/char/inter.c index cadb05f92..721017188 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -1,10 +1,6 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - #include "../common/db.h" #include "../common/mmo.h" #include "../common/socket.h" @@ -12,7 +8,6 @@ #include "../common/malloc.h" #include "../common/lock.h" #include "../common/showmsg.h" - #include "char.h" #include "inter.h" #include "int_party.h" @@ -22,6 +17,10 @@ #include "int_pet.h" #include "int_homun.h" +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + #define WISDATA_TTL (60*1000) // Existence time of Wisp/page data (60 seconds) // that is the waiting time of answers of all map-servers #define WISDELLIST_MAX 256 // Number of elements of Wisp/page data deletion list |