diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-12 13:53:36 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-12 13:53:36 +0000 |
| commit | 61622fe4e4875e2cadc8ede3f1a60f5e8cca89a5 (patch) | |
| tree | e5e96cb038e15c45c42617c64dceaa53a5c138ce /src/map/pc.h | |
| parent | 9fbe8dc7492c25bd0673d386e31982aa5026fdbc (diff) | |
| download | hercules-61622fe4e4875e2cadc8ede3f1a60f5e8cca89a5.tar.gz hercules-61622fe4e4875e2cadc8ede3f1a60f5e8cca89a5.tar.bz2 hercules-61622fe4e4875e2cadc8ede3f1a60f5e8cca89a5.tar.xz hercules-61622fe4e4875e2cadc8ede3f1a60f5e8cca89a5.zip | |
- Removed CART_MASK as OPTION_CART can take care of that.
- Moved the OPTION_MASK define to status.h
- Reverted the knockback implementation to use clif_slide instead of clif_fixpos
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9469 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 9d9809263..0eb406c7d 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -6,9 +6,7 @@ #include "map.h" #include "unit.h" - -#define OPTION_MASK 0xd7b8 -#define CART_MASK 0x788 +#include "status.h" //Update this max as necessary. 53 is the value needed for Super Baby currently #define MAX_SKILL_TREE 53 @@ -96,7 +94,7 @@ enum { #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&CART_MASK) +#define pc_iscarton(sd) ((sd)->sc.option&OPTION_CART) #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) |