summaryrefslogtreecommitdiff
path: root/src/map/chat.c
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:43:26 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:43:26 -0700
commit8f4e4e9a92f6af89820a358ab99b990697117502 (patch)
treecb312b5367c71dfe89543a5463be9555177c6445 /src/map/chat.c
parentf841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff)
parent2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff)
downloadtmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/map/chat.c')
-rw-r--r--src/map/chat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/chat.c b/src/map/chat.c
index 00aadea..ccb75df 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -28,7 +28,7 @@ int chat_createchat (struct map_session_data *sd, int limit, int pub,
nullpo_retr (0, sd);
- cd = calloc (1, sizeof (struct chat_data));
+ CREATE(cd, struct chat_data, 1);
cd->limit = limit;
cd->pub = pub;
@@ -279,7 +279,7 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger,
nullpo_retr (1, nd);
- cd = calloc (1, sizeof (struct chat_data));
+ CREATE (cd, struct chat_data, 1);
cd->limit = cd->trigger = limit;
if (trigger > 0)