diff options
| author | shennetsind <ind@henn.et> | 2013-06-19 08:47:00 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-19 08:47:00 -0300 |
| commit | 75c34fa8b87126aaf2b998ef429efe253ce5d105 (patch) | |
| tree | 8e0d1ccd07905b7c6212ef68e2d270b5edba9d83 /src/map/pc.h | |
| parent | 1edc31980be653e6482e4920862ac5d6ab0dd916 (diff) | |
| parent | bd95eccf047bda9d72abcea0724ad34b31131ab0 (diff) | |
| download | hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.tar.gz hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.tar.bz2 hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.tar.xz hercules-75c34fa8b87126aaf2b998ef429efe253ce5d105.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 5c585af1c..43d5d40c7 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -603,7 +603,7 @@ enum equip_pos { #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 ) /* equals pc_cant_act except it doesn't check for chat rooms */ -#define pc_cant_act2(sd) ( (sd)->npc_id || (sd)->state.vending || (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 ) #define pc_setdir(sd,b,h) ( (sd)->ud.dir = (b) ,(sd)->head_dir = (h) ) #define pc_setchatid(sd,n) ( (sd)->chatID = n ) |