diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-20 07:17:18 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-20 07:17:18 +0000 |
| commit | 38daeba66b5d2a9f6fc4eda795b6c9b8c77a7b54 (patch) | |
| tree | c813881903b95d5fa1d0d0d64ca4055d278e24c2 /src/map/npc.c | |
| parent | 7b13f57cb69e6b38aa793f135a3c673cc6e72398 (diff) | |
| download | hercules-38daeba66b5d2a9f6fc4eda795b6c9b8c77a7b54.tar.gz hercules-38daeba66b5d2a9f6fc4eda795b6c9b8c77a7b54.tar.bz2 hercules-38daeba66b5d2a9f6fc4eda795b6c9b8c77a7b54.tar.xz hercules-38daeba66b5d2a9f6fc4eda795b6c9b8c77a7b54.zip | |
- Changed the script source from unsigned char* to const char*.
- Updated plugins Makefile.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9532 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 7f7e7e669..447d04d7a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1361,7 +1361,7 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list) return 0; } -int npc_remove_map (struct npc_data *nd) +int npc_remove_map(struct npc_data *nd) { int m,i; nullpo_retr(1, nd); @@ -1431,11 +1431,11 @@ void npc_unload_duplicates (struct npc_data *nd) map_foreachiddb(npc_unload_dup_sub,nd->bl.id); } -int npc_unload (struct npc_data *nd) +int npc_unload(struct npc_data *nd) { nullpo_ret(nd); - npc_remove_map (nd); + npc_remove_map(nd); map_deliddb(&nd->bl); if (nd->chat_id) { @@ -2943,7 +2943,7 @@ int do_final_npc(void) if ((bl = map_id2bl(i))){ if (bl->type == BL_NPC) npc_unload((struct npc_data *)bl); - else if (bl->type&(BL_MOB|BL_PET)) + else if (bl->type&(BL_MOB|BL_PET))//## why BL_PET? [FlavioJS] unit_free(bl, 0); } } |