summaryrefslogtreecommitdiff
path: root/src/map/pc.h
diff options
context:
space:
mode:
authorEuphy <euphy@rathena.org>2013-06-20 22:29:03 -0400
committerEuphy <euphy@rathena.org>2013-06-20 22:29:03 -0400
commit86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (patch)
treedf955a23899586104e67359dc490891221b2875b /src/map/pc.h
parentcaa8a41b40a5ce3c96eb793619ff75f191ca558b (diff)
parent0f7c29113d7d898150108d66d1358f15bb018e0a (diff)
downloadhercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.gz
hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.bz2
hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.xz
hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: conf/plugins.conf db/pre-re/skill_tree.txt db/re/skill_tree.txt db/sc_config.txt npc/mobs/citycleaners.txt src/map/atcommand.c src/map/battle.c src/map/clif.c src/map/map.c src/map/packets.h src/map/pc.c src/map/script.c src/map/skill.c src/map/status.c src/map/storage.c src/map/trade.h Merged master.
Diffstat (limited to 'src/map/pc.h')
-rw-r--r--src/map/pc.h2
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 )