diff options
| author | shennetsind <ind@henn.et> | 2013-06-09 00:25:31 -0300 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-15 15:45:53 -0400 |
| commit | 77a2c29ca9b80b34e20478f0596ee00534b941c7 (patch) | |
| tree | 5ebfc108d1b0314f013a40fce1513722c47c2bc5 /src/map/battle.h | |
| parent | 600ed8a2ea7b56e4bfb66564f1bf5f948df51a9a (diff) | |
| download | hercules-77a2c29ca9b80b34e20478f0596ee00534b941c7.tar.gz hercules-77a2c29ca9b80b34e20478f0596ee00534b941c7.tar.bz2 hercules-77a2c29ca9b80b34e20478f0596ee00534b941c7.tar.xz hercules-77a2c29ca9b80b34e20478f0596ee00534b941c7.zip | |
Fixed Bug #7308
Special Thanks to kyeme, mkbu95!
http://hercules.ws/board/tracker/issue-7308-guild-aura-on-ally/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 36796c516..707868e43 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -55,16 +55,19 @@ typedef enum damage_lv { } damage_lv; 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, + BCT_NOONE = 0x000000, + BCT_SELF = 0x010000, + BCT_ENEMY = 0x020000, + BCT_PARTY = 0x040000, + BCT_GUILD = 0x080000, + BCT_NEUTRAL = 0x100000, + BCT_SAMEGUILD = 0x200000, // No Guild Allies + + BCT_NOGUILD = 0x170000, // This should be (~BCT_GUILD&BCT_ALL) + BCT_NOPARTY = 0x1b0000, // This should be (~BCT_PARTY&BCT_ALL) + BCT_NOENEMY = 0x1d0000, // This should be (~BCT_ENEMY&BCT_ALL) + + BCT_ALL = 0x1f0000, // Sum of BCT_NOONE to BCT_GUILD }; /** |