From 139b774dd07e3dab16c62956c19a571c498e1ac0 Mon Sep 17 00:00:00 2001 From: Lance Date: Fri, 17 Mar 2006 16:14:29 +0000 Subject: Reappropriate my previous fix on map_foreachiddb, it's npc_unload's problem. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5647 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 8f9e5ed81..56affa0b5 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1532,7 +1532,10 @@ static int npc_unload_ev(DBKey key,void *data,va_list ap) { int npc_unload (struct npc_data *nd) { + nullpo_retv(nd); + npc_remove_map (nd); + map_deliddb(&nd->bl); if (nd->chat_id) { struct chat_data *cd = (struct chat_data*)map_id2bl(nd->chat_id); @@ -2794,7 +2797,6 @@ static int npc_cleanup_sub (struct block_list *bl, va_list ap) { } static int npc_cleanup_dbsub(DBKey key,void * data,va_list app) { - map_deliddb((struct block_list*)data); return npc_cleanup_sub((struct block_list*)data, 0); } -- cgit v1.2.3-70-g09d2