diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-08 12:28:41 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-08 12:28:41 +0000 |
| commit | 88d6a3c6c1c62e2742251bc9d6877182ba01aa5b (patch) | |
| tree | 9c1c98b5aa4b39bfbb4ef124f4cc4fa36325d23a | |
| parent | 5b24315ae353c051415fd878c4a2817c94b6a245 (diff) | |
| download | hercules-88d6a3c6c1c62e2742251bc9d6877182ba01aa5b.tar.gz hercules-88d6a3c6c1c62e2742251bc9d6877182ba01aa5b.tar.bz2 hercules-88d6a3c6c1c62e2742251bc9d6877182ba01aa5b.tar.xz hercules-88d6a3c6c1c62e2742251bc9d6877182ba01aa5b.zip | |
* 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
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/clif.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9b53bb6c2..c4d0382a2 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/01/08 + * 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). [Ai4rei] * Fixed kill steal protection result in skill casting (unit_skilluse_id2) not getting evaluated (bugreport:1808, since r12203). [Ai4rei] - Moved kill steal protection in skill casting to be only executed, after the actual target has been determined and validated (since r12203). * Applied fix provided by Valaris to make /pvpinfo actually work. (bugreport:1785, since r1602). [Ai4rei] 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); } /*========================================== |