diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-06-17 00:31:23 -0700 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-06-17 00:31:23 -0700 |
| commit | 962d203f95fd8b81d504f60aa28bb17cc268395d (patch) | |
| tree | ee135ec397a8eceb679db918614084a32cc96952 /src/map/clif.c | |
| parent | 23167727ed5e798f12e2b9140b405b83003186e7 (diff) | |
| download | hercules-962d203f95fd8b81d504f60aa28bb17cc268395d.tar.gz hercules-962d203f95fd8b81d504f60aa28bb17cc268395d.tar.bz2 hercules-962d203f95fd8b81d504f60aa28bb17cc268395d.tar.xz hercules-962d203f95fd8b81d504f60aa28bb17cc268395d.zip | |
Fixed Bug#7380
-showprogressbar should now work as official.(Thanks Kyeme & Ryuuzaki)
Fixed insane damage of Hatred Skills.
(http://hercules.ws/board/topic/1110-renewal-attack/ - Thanks Axiom)
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index a752f1bc1..9fae03ef0 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9757,7 +9757,7 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd) if( iTimer->gettick() < sd->progressbar.timeout && sd->st ) sd->st->state = END; - sd->progressbar.npc_id = sd->progressbar.timeout = 0; + sd->state.workinprogress = sd->progressbar.npc_id = sd->progressbar.timeout = 0; npc_scriptcont(sd, npc_id, false); } @@ -9777,8 +9777,8 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd) if (sd->sc.opt1 && ( sd->sc.opt1 == OPT1_STONEWAIT || sd->sc.opt1 == OPT1_BURNING )) ; //You CAN walk on this OPT1 value. - else if( sd->progressbar.npc_id ) - clif->progressbar_abort(sd); + /*else if( sd->progressbar.npc_id ) + clif->progressbar_abort(sd);*/ else if (pc_cant_act(sd)) return; |