From 95f2b0089f0e64ebb0b1ac5bf409450b26e06321 Mon Sep 17 00:00:00 2001 From: Lance Date: Tue, 18 Apr 2006 11:43:18 +0000 Subject: [PATCH] Modifying st->oid is dangerous. Using sd->state.using_fake_npc as identifier instead. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6152 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/map/script.c b/src/map/script.c index 8d5d66087f..cc0483c5c9 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10872,7 +10872,6 @@ int run_script_main(struct script_state *st) if(st->oid && st->rid && (bl = map_id2bl(st->oid))){ if(bl->type == BL_PC){ clif_sendfakenpc(((TBL_PC *)bl),dummy_npc_id); - st->oid = dummy_npc_id; } else if(bl->type == BL_NPC){ if(npc_checknear(((TBL_PC *)bl), bl->id)) clif_sendfakenpc(((struct map_session_data *)bl),st->oid); @@ -10975,7 +10974,7 @@ int run_script_main(struct script_state *st) { struct map_session_data *sd=map_id2sd(st->rid); st->pos=-1; - if(sd && sd->npc_id==st->oid){ + if(sd && (sd->npc_id==st->oid || sd->state.using_fake_npc)){ if(sd->state.using_fake_npc){ clif_clearchar_id(sd->npc_id, 0, sd->fd); sd->state.using_fake_npc = 0;