diff options
| author | Ibrahem Hossam <hemagx2@gmail.com> | 2016-04-24 13:13:19 +0200 |
|---|---|---|
| committer | Ibrahem Hossam <hemagx2@gmail.com> | 2016-04-24 13:13:19 +0200 |
| commit | 31e27a130676e3e416b583bb947f9dd87efdce81 (patch) | |
| tree | f91422fa8b0ecd93ccb15720bc15a9b9b839cfd2 /src/map/pc.h | |
| parent | 3ccc681a4bebd5b91b96c1c7059fdec91f2b5d16 (diff) | |
| parent | 9fdb4567ab8af97004d7c6dcd35f27f788b0bb15 (diff) | |
| download | hercules-31e27a130676e3e416b583bb947f9dd87efdce81.tar.gz hercules-31e27a130676e3e416b583bb947f9dd87efdce81.tar.bz2 hercules-31e27a130676e3e416b583bb947f9dd87efdce81.tar.xz hercules-31e27a130676e3e416b583bb947f9dd87efdce81.zip | |
Merge pull request #1264 from HerculesWS/vs2015
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 5d35fd1cc..58f7a2266 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -258,7 +258,7 @@ struct map_session_data { struct script_state *st; char npc_str[CHATBOX_SIZE]; // for passing npc input box text to script engine int npc_timer_id; //For player attached npc timers. [Skotlex] - unsigned int chatID; + int chat_id; int64 idletime; struct { int npc_id; @@ -610,15 +610,15 @@ END_ZEROED_BLOCK; #define pc_setsit(sd) ( (sd)->state.dead_sit = (sd)->vd.dead_sit = 2 ) #define pc_isdead(sd) ( (sd)->state.dead_sit == 1 ) #define pc_issit(sd) ( (sd)->vd.dead_sit == 2 ) -#define pc_isidle(sd) ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(sockt->last_tick, (sd)->idletime) >= battle->bc->idle_no_share ) +#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)->chatID || ((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 ) /* 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_setdir(sd,b,h) ( (sd)->ud.dir = (b) ,(sd)->head_dir = (h) ) -#define pc_setchatid(sd,n) ( (sd)->chatID = n ) +#define pc_setchatid(sd,n) ( (sd)->chat_id = (n) ) #define pc_ishiding(sd) ( (sd)->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) ) #define pc_iscloaking(sd) ( !((sd)->sc.option&OPTION_CHASEWALK) && ((sd)->sc.option&OPTION_CLOAK) ) #define pc_ischasewalk(sd) ( (sd)->sc.option&OPTION_CHASEWALK ) |