diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-23 07:12:02 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-23 07:12:02 +0000 |
| commit | d436404bd7279a831804f0536e97e29dd484f7bb (patch) | |
| tree | afd48d6a8e0aa78fb54743b3c179e5ef3f1cf65c /src/map/battle.h | |
| parent | bc6ac0943bd618ae8cc484ba517d75d417e612a7 (diff) | |
| download | hercules-d436404bd7279a831804f0536e97e29dd484f7bb.tar.gz hercules-d436404bd7279a831804f0536e97e29dd484f7bb.tar.bz2 hercules-d436404bd7279a831804f0536e97e29dd484f7bb.tar.xz hercules-d436404bd7279a831804f0536e97e29dd484f7bb.zip | |
* Changed enumerating defines into enumerations (related topic:264007).
- Minor fixups on few macros.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14831 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 58f622321..f67f2b8c6 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -72,20 +72,19 @@ struct block_list* battle_getenemy(struct block_list *target, int type, int rang int battle_gettarget(struct block_list *bl); int battle_getcurrentskill(struct block_list *bl); -//New definitions [Skotlex] -#define BCT_ENEMY 0x020000 -//This should be (~BCT_ENEMY&BCT_ALL) -#define BCT_NOENEMY 0x1d0000 -#define BCT_PARTY 0x040000 -//This should be (~BCT_PARTY&BCT_ALL) -#define BCT_NOPARTY 0x1b0000 -#define BCT_GUILD 0x080000 -//This should be (~BCT_GUILD&BCT_ALL) -#define BCT_NOGUILD 0x170000 -#define BCT_ALL 0x1f0000 -#define BCT_NOONE 0x000000 -#define BCT_SELF 0x010000 -#define BCT_NEUTRAL 0x100000 +enum e_battle_check_target +{//New definitions [Skotlex] + BCT_ENEMY = 0x020000, + BCT_NOENEMY = 0x1d0000, //This should be (~BCT_ENEMY&BCT_ALL) + BCT_PARTY = 0x040000, + BCT_NOPARTY = 0x1b0000, //This should be (~BCT_PARTY&BCT_ALL) + BCT_GUILD = 0x080000, + BCT_NOGUILD = 0x170000, //This should be (~BCT_GUILD&BCT_ALL) + BCT_ALL = 0x1f0000, + BCT_NOONE = 0x000000, + BCT_SELF = 0x010000, + BCT_NEUTRAL = 0x100000, +}; #define is_boss(bl) (status_get_mode(bl)&MD_BOSS) // Can refine later [Aru] |