From a75f13f9a36ad91cf2fd07257beccbf5bd189c75 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 29 Dec 2011 22:51:31 +0000 Subject: 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 --- src/map/pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/pc.h') diff --git a/src/map/pc.h b/src/map/pc.h index 06c0f808c..7f036d790 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -571,7 +571,7 @@ enum equip_index { #define pc_issit(sd) ( (sd)->vd.dead_sit == 2 ) #define pc_isidle(sd) ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(last_tick, (sd)->idletime) >= battle_config.idle_no_share ) #define pc_istrading(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->state.trading ) -#define pc_cant_act(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chatID || (sd)->sc.opt1 || (sd)->state.trading || (sd)->state.storage_flag ) +#define pc_cant_act(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chatID || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag ) #define pc_setdir(sd,b,h) ( (sd)->ud.dir = (b) ,(sd)->head_dir = (h) ) #define pc_setchatid(sd,n) ( (sd)->chatID = n ) #define pc_ishiding(sd) ( (sd)->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) ) -- cgit v1.2.3-60-g2f50