diff options
| -rw-r--r-- | src/map/clif.c | 25 | ||||
| -rw-r--r-- | src/map/npc.c | 5 | ||||
| -rw-r--r-- | src/map/npc.h | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 8 | ||||
| -rw-r--r-- | src/map/script.c | 2 | ||||
| -rw-r--r-- | src/map/script.h | 2 |
6 files changed, 28 insertions, 16 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index b7117a64a..dcbeae3c4 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); + npc_scriptcont(sd, npc_id, false); } @@ -10179,12 +10179,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd) return; } - //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 ) + if ( (!sd->npc_id && pc_istrading(sd)) || sd->chatID ) return; //Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex] @@ -10795,6 +10790,12 @@ 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) ) @@ -11129,7 +11130,7 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) } sd->npc_menu = select; - npc_scriptcont(sd,npc_id); + npc_scriptcont(sd,npc_id, false); } @@ -11137,7 +11138,7 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) /// 00b9 <npc id>.L void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd) { - npc_scriptcont(sd,RFIFOL(fd,2)); + npc_scriptcont(sd,RFIFOL(fd,2), false); } @@ -11149,7 +11150,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); + npc_scriptcont(sd, npcid, false); } @@ -11165,7 +11166,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); + npc_scriptcont(sd, npcid, false); } @@ -11175,7 +11176,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)); + npc_scriptcont(sd, RFIFOL(fd,2), true); } diff --git a/src/map/npc.c b/src/map/npc.c index f72f6532c..21859727f 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1194,7 +1194,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd) /*========================================== * *------------------------------------------*/ -int npc_scriptcont(struct map_session_data* sd, int id) +int npc_scriptcont(struct map_session_data* sd, int id, bool closing) { nullpo_retr(1, sd); @@ -1229,6 +1229,9 @@ int npc_scriptcont(struct map_session_data* sd, int id) if( sd->progressbar.npc_id && DIFF_TICK(sd->progressbar.timeout,gettick()) > 0 ) return 1; + if( closing && sd->st->state == CLOSE ) + sd->st->state = END; + run_script_main(sd->st); return 0; diff --git a/src/map/npc.h b/src/map/npc.h index ee88da08c..7b69cac34 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -118,7 +118,7 @@ int npc_touch_areanpc2(struct mob_data *md); // [Skotlex] int npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range); int npc_touchnext_areanpc(struct map_session_data* sd,bool leavemap); int npc_click(struct map_session_data* sd, struct npc_data* nd); -int npc_scriptcont(struct map_session_data* sd, int id); +int npc_scriptcont(struct map_session_data* sd, int id, bool closing); struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl); int npc_buysellsel(struct map_session_data* sd, int id, int type); int npc_buylist(struct map_session_data* sd,int n, unsigned short* item_list); diff --git a/src/map/pc.c b/src/map/pc.c index 6078283e7..7eae16193 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4232,6 +4232,14 @@ int pc_useitem(struct map_session_data *sd,int n) nullpo_ret(sd); + //This flag enables you to use items while in an NPC. [Skotlex] + if( sd->npc_id && sd->npc_id != sd->npc_item_flag ){ +#ifdef RENEWAL + clif_msg(sd, 0x783); // TODO look for the client date that has this message. +#endif + return 0; + } + if( sd->status.inventory[n].nameid <= 0 || sd->status.inventory[n].amount <= 0 ) return 0; diff --git a/src/map/script.c b/src/map/script.c index 8827509ba..c4ee96feb 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4392,7 +4392,7 @@ BUILDIN_FUNC(close) if( sd == NULL ) return 0; - st->state = END; + st->state = CLOSE; clif_scriptclose(sd, st->oid); return 0; } diff --git a/src/map/script.h b/src/map/script.h index ed56b8ebe..b27b3d290 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -114,7 +114,7 @@ struct script_stack { // // Script state // -enum e_script_state { RUN,STOP,END,RERUNLINE,GOTO,RETFUNC }; +enum e_script_state { RUN,STOP,END,RERUNLINE,GOTO,RETFUNC,CLOSE }; struct script_state { struct script_stack* stack; |