From 88d6a3c6c1c62e2742251bc9d6877182ba01aa5b Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 8 Jan 2011 12:28:41 +0000 Subject: * Fixed script command 'progressbar' resuming fails on second invocation, when there was no script pause between the first and second call (bugreport:4698, since r14024). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14659 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 0a93895a9..c820c0163 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8724,11 +8724,13 @@ void clif_progressbar_abort(struct map_session_data * sd) void clif_parse_progressbar(int fd, struct map_session_data * sd) { + int npc_id = sd->progressbar.npc_id; + if( gettick() < sd->progressbar.timeout && sd->st ) sd->st->state = END; - npc_scriptcont(sd, sd->progressbar.npc_id); sd->progressbar.npc_id = sd->progressbar.timeout = 0; + npc_scriptcont(sd, npc_id); } /*========================================== -- cgit v1.2.3-70-g09d2