summaryrefslogtreecommitdiff
path: root/src/map/pc.h
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-05-10 03:05:29 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-05-13 05:18:02 +0200
commit9a64eca5235da46655ca64ba5916c6fd4d90208a (patch)
treea11a4aa10060e7b32553000dcbaf5c9fc52dd59b /src/map/pc.h
parentcfe2d8527ecc8eb8e6dfacc7e661c5ed1f08ddd9 (diff)
downloadhercules-9a64eca5235da46655ca64ba5916c6fd4d90208a.tar.gz
hercules-9a64eca5235da46655ca64ba5916c6fd4d90208a.tar.bz2
hercules-9a64eca5235da46655ca64ba5916c6fd4d90208a.tar.xz
hercules-9a64eca5235da46655ca64ba5916c6fd4d90208a.zip
Add skill_enabled_npc battle flag and implement usage
Diffstat (limited to 'src/map/pc.h')
-rw-r--r--src/map/pc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index 01fd855b7..f9526c248 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -686,6 +686,7 @@ END_ZEROED_BLOCK;
#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)->chat_id != 0 || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refine_ui == 1 || (sd)->state.lapine_ui == 1)
#define pc_cant_act_except_lapine(sd) ((sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chat_id != 0 || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refine_ui == 1)
+#define pc_cant_act_except_npc(sd) ( (sd)->state.vending != 0 || (sd)->state.buyingstore != 0 || (sd)->chat_id != 0 || ((sd)->sc.opt1 != 0 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading != 0 || (sd)->state.storage_flag != 0 || (sd)->state.prevend != 0 || (sd)->state.refine_ui == 1 || (sd)->state.lapine_ui == 1)
/* equals pc_cant_act except it doesn't check for chat rooms */
#define pc_cant_act2(sd) ( (sd)->npc_id || (sd)->state.buyingstore || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refine_ui == 1 || (sd)->state.lapine_ui == 1)