Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modifying st->oid is dangerous. Using sd->state.using_fake_npc as identifier instead.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6152 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance
2006-04-18 11:43:18 +00:00
parent c0b1eb7787
commit 95f2b0089f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/script.c
View File

@@ -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;