From b745cb176a16e771bf5bbae43a7445cf160d1342 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Sat, 15 Jun 2013 03:25:38 -0300 Subject: - HPM: Added trade interface; - Moved PARTY_RECRUIT definition to mmo.h to avoid segfault; - Check if item is already at maximum refine; - Fixed that @reloadscript with one npc bug (thanks to akinari). Signed-off-by: Matheus Macabu --- src/map/pc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 155812836..ef70aad97 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6667,7 +6667,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) { npc_script_event(sd,NPCE_DIE); // Clear anything NPC-related when you die and was interacting with one. - if (sd->npc_id) { + if (sd->npc_id || sd->npc_shopid) { if (sd->state.using_fake_npc) { clif->clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd); sd->state.using_fake_npc = 0; @@ -6678,6 +6678,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) { sd->npc_menu = 0; sd->npc_id = 0; + sd->npc_shopid = 0; if (sd->st && sd->st->state != END) sd->st->state = END; } -- cgit v1.2.3-70-g09d2