summaryrefslogtreecommitdiff
path: root/src/map/pc.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/pc.h')
-rw-r--r--src/map/pc.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index ba6f73d17..817ad7a5c 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -613,7 +613,13 @@ enum e_pc_permission {
#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 )
-#define pc_iscarton(sd) ( (sd)->sc.option&OPTION_CART )
+
+#ifdef NEW_CARTS
+ #define pc_iscarton(sd) ( (sd)->sc.data[SC_PUSH_CART] )
+#else
+ #define pc_iscarton(sd) ( (sd)->sc.option&OPTION_CART )
+#endif
+
#define pc_isfalcon(sd) ( (sd)->sc.option&OPTION_FALCON )
#define pc_isriding(sd) ( (sd)->sc.option&OPTION_RIDING )
#define pc_isinvisible(sd) ( (sd)->sc.option&OPTION_INVISIBLE )