diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 07:36:52 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 07:36:52 +0200 |
| commit | 43526bed2d926f1941504abd63e579e560c774f2 (patch) | |
| tree | f948c9e8400e1503b9dc2160b22894495803a6e9 | |
| parent | 60332ab78298fd4408968deb34b0ce072385b91b (diff) | |
| download | hercules-43526bed2d926f1941504abd63e579e560c774f2.tar.gz hercules-43526bed2d926f1941504abd63e579e560c774f2.tar.bz2 hercules-43526bed2d926f1941504abd63e579e560c774f2.tar.xz hercules-43526bed2d926f1941504abd63e579e560c774f2.zip | |
Add pc_istrading_except_npc() macro
| -rw-r--r-- | src/map/pc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 074c01a13..a6eeb5209 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -682,6 +682,7 @@ END_ZEROED_BLOCK; #define pc_issit(sd) ( (sd)->vd.dead_sit == 2 ) #define pc_isidle(sd) ( (sd)->chat_id != 0 || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(sockt->last_tick, (sd)->idletime) >= battle->bc->idle_no_share ) #define pc_istrading(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->state.trading ) +#define pc_istrading_except_npc(sd) ( (sd)->state.vending != 0 || (sd)->state.buyingstore != 0 || (sd)->state.trading != 0 ) #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) |