diff options
| author | Haru <haru@dotalux.com> | 2019-05-06 00:19:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 00:19:06 +0200 |
| commit | 574801d93c55b5ac41f9bdbd660f747f1c5aaa76 (patch) | |
| tree | 473c9ada31454ae62f73215ade30687cd61a3b4e /src/map/pc.h | |
| parent | 31f47be4b26e69d2880e12530d021ce6c8c802ea (diff) | |
| parent | 86a3d6ce9b259baf29d7cc05a8e75aa2b1e3ac24 (diff) | |
| download | hercules-574801d93c55b5ac41f9bdbd660f747f1c5aaa76.tar.gz hercules-574801d93c55b5ac41f9bdbd660f747f1c5aaa76.tar.bz2 hercules-574801d93c55b5ac41f9bdbd660f747f1c5aaa76.tar.xz hercules-574801d93c55b5ac41f9bdbd660f747f1c5aaa76.zip | |
Merge pull request #2446 from hemagx/refinery_ui_update
Implement Refinery ui and Refine code refactor
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index b2069d4df..42c9d204e 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -237,6 +237,7 @@ struct map_session_data { unsigned int standalone : 1;/* [Ind/Hercules <3] */ unsigned int loggingout : 1; unsigned int warp_clean : 1; + unsigned int refine_ui : 1; } state; struct { unsigned char no_weapon_damage, no_magic_damage, no_misc_damage; @@ -660,10 +661,10 @@ 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_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 ) +#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) /* 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 ) +#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) #define pc_setdir(sd,b,h) ( (sd)->ud.dir = (b) ,(sd)->head_dir = (h) ) #define pc_setchatid(sd,n) ( (sd)->chat_id = (n) ) |