diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-06-15 03:25:38 -0300 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-15 15:58:17 -0400 |
| commit | fa0c8cda0b2f68fa742572409c8f77e65d5d0011 (patch) | |
| tree | 5ff06d6d33fc31dd6d5dc1f54b6639684bf0cf0a /src/map/pc.c | |
| parent | 533c8b3500aad49f0b00423c69e44ac8afa9faf0 (diff) | |
| download | hercules-fa0c8cda0b2f68fa742572409c8f77e65d5d0011.tar.gz hercules-fa0c8cda0b2f68fa742572409c8f77e65d5d0011.tar.bz2 hercules-fa0c8cda0b2f68fa742572409c8f77e65d5d0011.tar.xz hercules-fa0c8cda0b2f68fa742572409c8f77e65d5d0011.zip | |
- 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 <mkbu95@gmail.com>
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |