summaryrefslogtreecommitdiff
path: root/src/map/chat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/chat.cpp')
-rw-r--r--src/map/chat.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/chat.cpp b/src/map/chat.cpp
index 1f9f433..75b45e9 100644
--- a/src/map/chat.cpp
+++ b/src/map/chat.cpp
@@ -117,7 +117,8 @@ int chat_deletenpcchat(struct npc_data *nd)
struct chat_data *cd;
nullpo_ret(nd);
- nullpo_ret(cd = (struct chat_data *) map_id2bl(nd->chat_id));
+ cd = (struct chat_data *) map_id2bl(nd->chat_id);
+ nullpo_ret(cd);
chat_npckickall(cd);
map_delobject(cd->bl.id, BL_CHAT); // freeまでしてくれる