From 5aaade5da584a6b5935fc7c11016d373c2ea27b7 Mon Sep 17 00:00:00 2001 From: Lance Date: Sun, 14 May 2006 13:08:26 +0000 Subject: @_@ this is getting more confusing... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6586 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 6ce6c6e59..c8610caf3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1822,14 +1822,14 @@ void clif_sendfakenpc(struct map_session_data *sd, int npcid) { int clif_scriptmenu(struct map_session_data *sd, int npcid, char *mes) { int fd; int slen = strlen(mes) + 8; - struct block_list *bl = map_id2bl(npcid); + struct block_list *bl = NULL; WFIFOHEAD(fd, slen); nullpo_retr(0, sd); - if (!sd->state.using_fake_npc && (bl->type == BL_PC || bl->m!=sd->bl.m || + if (!sd->state.using_fake_npc && (npcid == fake_npc_id || ((bl = map_id2bl(npcid)) && (bl->m!=sd->bl.m || bl->xbl.x-AREA_SIZE-1 || bl->x>sd->bl.x+AREA_SIZE+1 || - bl->ybl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)) + bl->ybl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)))) clif_sendfakenpc(sd, npcid); fd=sd->fd; @@ -1848,13 +1848,13 @@ int clif_scriptmenu(struct map_session_data *sd, int npcid, char *mes) { */ int clif_scriptinput(struct map_session_data *sd, int npcid) { int fd; - struct block_list *bl = map_id2bl(npcid); + struct block_list *bl = NULL; nullpo_retr(0, sd); - if (!sd->state.using_fake_npc && (bl->type == BL_PC || bl->m!=sd->bl.m || + if (!sd->state.using_fake_npc && (npcid == fake_npc_id || ((bl = map_id2bl(npcid)) && (bl->m!=sd->bl.m || bl->xbl.x-AREA_SIZE-1 || bl->x>sd->bl.x+AREA_SIZE+1 || - bl->ybl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)) + bl->ybl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)))) clif_sendfakenpc(sd, npcid); fd=sd->fd; @@ -1872,13 +1872,13 @@ int clif_scriptinput(struct map_session_data *sd, int npcid) { */ int clif_scriptinputstr(struct map_session_data *sd, int npcid) { int fd; - struct block_list *bl = map_id2bl(npcid); + struct block_list *bl = NULL; nullpo_retr(0, sd); - if (!sd->state.using_fake_npc && (bl->type == BL_PC || bl->m!=sd->bl.m || + if (!sd->state.using_fake_npc && (npcid == fake_npc_id || ((bl = map_id2bl(npcid)) && (bl->m!=sd->bl.m || bl->xbl.x-AREA_SIZE-1 || bl->x>sd->bl.x+AREA_SIZE+1 || - bl->ybl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)) + bl->ybl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)))) clif_sendfakenpc(sd, npcid); fd=sd->fd; -- cgit v1.2.3-70-g09d2