summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-29 22:51:31 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-29 22:51:31 +0000
commita75f13f9a36ad91cf2fd07257beccbf5bd189c75 (patch)
treec52640d4dff0c8c127bc907fffeadace27882bc6 /src/map/clif.c
parent863e194ec315b6b45dd0862654359a8f6283f699 (diff)
downloadhercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.tar.gz
hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.tar.bz2
hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.tar.xz
hercules-a75f13f9a36ad91cf2fd07257beccbf5bd189c75.zip
Fixed SC_BURNING icon not going off after it was over;
Fixed SC_BURNING from making character unable to move/cast skills/use items/etc, bugreport:5174 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15328 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 01fabf6d9..73f97cdb0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9013,7 +9013,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
return;
}
- if (sd->sc.opt1 && sd->sc.opt1 == OPT1_STONEWAIT)
+ 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);
@@ -9320,7 +9320,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
return;
}
- if (sd->ud.skilltimer != INVALID_TIMER || sd->sc.opt1)
+ if (sd->ud.skilltimer != INVALID_TIMER || (sd->sc.opt1 && sd->sc.opt1 != OPT1_BURNING ))
break;
if (sd->sc.count && (
@@ -9640,7 +9640,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
return;
}
- if (sd->sc.opt1 > 0 && sd->sc.opt1 != OPT1_STONEWAIT)
+ if (sd->sc.opt1 > 0 && sd->sc.opt1 != OPT1_STONEWAIT && sd->sc.opt1 != OPT1_BURNING)
return;
//This flag enables you to use items while in an NPC. [Skotlex]