diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-14 19:36:05 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-14 19:36:05 +0000 |
| commit | 7a612f8db0c03ba748a174c97e9bc2cf902d8b10 (patch) | |
| tree | cdcfc314cbcb079c65dc7951dda42e983f050a71 /src/map/pc.h | |
| parent | c07a09726d9e94d75786192fc671cde81dc73176 (diff) | |
| download | hercules-7a612f8db0c03ba748a174c97e9bc2cf902d8b10.tar.gz hercules-7a612f8db0c03ba748a174c97e9bc2cf902d8b10.tar.bz2 hercules-7a612f8db0c03ba748a174c97e9bc2cf902d8b10.tar.xz hercules-7a612f8db0c03ba748a174c97e9bc2cf902d8b10.zip | |
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
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 8 |
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 ) |