summaryrefslogtreecommitdiff
path: root/src/map/chat.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/chat.c')
-rw-r--r--src/map/chat.c9
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)