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/map/chat.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/map/chat.c')
| -rw-r--r-- | src/map/chat.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/chat.c b/src/map/chat.c index 772ac4c..00aadea 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -3,9 +3,8 @@ #include <stdlib.h> #include <string.h> -#include "db.h" -#include "nullpo.h" -#include "malloc.h" +#include "../common/db.h" +#include "../common/nullpo.h" #include "map.h" #include "clif.h" #include "pc.h" @@ -29,7 +28,7 @@ int chat_createchat (struct map_session_data *sd, int limit, int pub, nullpo_retr (0, sd); - cd = aCalloc (1, sizeof (struct chat_data)); + cd = calloc (1, sizeof (struct chat_data)); cd->limit = limit; cd->pub = pub; @@ -280,7 +279,7 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, nullpo_retr (1, nd); - cd = aCalloc (1, sizeof (struct chat_data)); + cd = calloc (1, sizeof (struct chat_data)); cd->limit = cd->trigger = limit; if (trigger > 0) |