From 7a612f8db0c03ba748a174c97e9bc2cf902d8b10 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 14 Jun 2012 19:36:05 +0000 Subject: Added support for new carts (requires packetver 20120201 or newer). Super-Ultra-Plus thanks to Fatal Error and Judas. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16297 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/map/pc.h') 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 ) -- cgit v1.2.3-60-g2f50