From d4582e286fa64f469112ff76ecae672ce7c57aa5 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sun, 24 Feb 2013 01:09:26 -0300 Subject: Revert "Fixed Bug #7091" This reverts commit adda8d74c3280ae1e3745591caafd9ce6e81ded7. Signed-off-by: shennetsind --- src/map/clif.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index dcbeae3c4..b7117a64a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9520,7 +9520,7 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd) sd->st->state = END; sd->progressbar.npc_id = sd->progressbar.timeout = 0; - npc_scriptcont(sd, npc_id, false); + npc_scriptcont(sd, npc_id); } @@ -10179,7 +10179,12 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd) return; } - if ( (!sd->npc_id && pc_istrading(sd)) || sd->chatID ) + //This flag enables you to use items while in an NPC. [Skotlex] + if (sd->npc_id) { + if (sd->npc_id != sd->npc_item_flag) + return; + } + else if ( pc_istrading(sd) || sd->chatID ) return; //Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex] @@ -10790,12 +10795,6 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) // Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex] sd->idletime = last_tick; - if( sd->npc_id ){ -#ifdef RENEWAL - clif_msg(sd, 0x783); // TODO look for the client date that has this message. -#endif - return; - } if( pc_cant_act(sd) && skill_id != RK_REFRESH && !(skill_id == SR_GENTLETOUCH_CURE && (sd->sc.opt1 == OPT1_STONE || sd->sc.opt1 == OPT1_FREEZE || sd->sc.opt1 == OPT1_STUN)) ) return; if( pc_issit(sd) ) @@ -11130,7 +11129,7 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) } sd->npc_menu = select; - npc_scriptcont(sd,npc_id, false); + npc_scriptcont(sd,npc_id); } @@ -11138,7 +11137,7 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) /// 00b9 .L void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd) { - npc_scriptcont(sd,RFIFOL(fd,2), false); + npc_scriptcont(sd,RFIFOL(fd,2)); } @@ -11150,7 +11149,7 @@ void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd) int amount = (int)RFIFOL(fd,6); sd->npc_amount = amount; - npc_scriptcont(sd, npcid, false); + npc_scriptcont(sd, npcid); } @@ -11166,7 +11165,7 @@ void clif_parse_NpcStringInput(int fd, struct map_session_data* sd) return; // invalid input safestrncpy(sd->npc_str, message, min(message_len,CHATBOX_SIZE)); - npc_scriptcont(sd, npcid, false); + npc_scriptcont(sd, npcid); } @@ -11176,7 +11175,7 @@ void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd) { if (!sd->npc_id) //Avoid parsing anything when the script was done with. [Skotlex] return; - npc_scriptcont(sd, RFIFOL(fd,2), true); + npc_scriptcont(sd,RFIFOL(fd,2)); } -- cgit v1.2.3-70-g09d2