diff options
| author | shennetsind <ind@henn.et> | 2014-01-12 15:10:55 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-01-12 15:10:55 -0200 |
| commit | 8aeb011694ca3023d93dd6e904b3f42ab93f8ba9 (patch) | |
| tree | 5fbf3ff907495e0f20c2da650edf37d9f18ce125 /src/map/npc.c | |
| parent | ca6454b94bd9e2bcf5ddd9c51bea23d5c2bf6d78 (diff) | |
| download | hercules-8aeb011694ca3023d93dd6e904b3f42ab93f8ba9.tar.gz hercules-8aeb011694ca3023d93dd6e904b3f42ab93f8ba9.tar.bz2 hercules-8aeb011694ca3023d93dd6e904b3f42ab93f8ba9.tar.xz hercules-8aeb011694ca3023d93dd6e904b3f42ab93f8ba9.zip | |
Two Adjustments
From some notes I took while working on the megapatch:
- Dropped unused char_dat variable in chrif's auth_node
- Fixed DB/BB/PB Logging, which could create false logs due to where it was placed.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 9ed6d2a7e..722e5199c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2188,7 +2188,7 @@ int npc_unload(struct npc_data* nd, bool single) { if( single && nd->bl.m != -1 ) map->remove_questinfo(nd->bl.m,nd); - if( (nd->subtype == SHOP || nd->subtype == CASHSHOP) && nd->src_id == 0) //src check for duplicate shops [Orcao] + if( nd->src_id == 0 && ( nd->subtype == SHOP || nd->subtype == CASHSHOP ) ) //src check for duplicate shops [Orcao] aFree(nd->u.shop.shop_item); else if( nd->subtype == SCRIPT ) { struct s_mapiterator* iter; |