diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-24 20:06:01 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-24 20:06:01 +0800 |
| commit | 137cc4396d651798a95641d529955845a25a56e1 (patch) | |
| tree | b04eccd22e415d4a9823a2f7677517d29047ee97 /src/map/npc.c | |
| parent | fa2751b503d41388cf82dbf882877db280b1bba7 (diff) | |
| download | hercules-137cc4396d651798a95641d529955845a25a56e1.tar.gz hercules-137cc4396d651798a95641d529955845a25a56e1.tar.bz2 hercules-137cc4396d651798a95641d529955845a25a56e1.tar.xz hercules-137cc4396d651798a95641d529955845a25a56e1.zip | |
Fixed Bug #7092
-Follow up adda8d74c3280ae1e3745591caafd9ce6e81ded7 where 'close2' is not working properly.
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |