summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-06-09 02:04:35 -0300
committershennetsind <ind@henn.et>2013-06-09 02:04:35 -0300
commit74d9eeee60543806e8902812349bcc67e1ddead1 (patch)
tree9e5b4c6e80048becc4e5c3e54c19626f67745595 /src/map/battle.h
parentb15841ec20dd18f5e126033604de9f6f97a2190f (diff)
parentde8b0185c61ff017bb22ffc17754a6711356bd9f (diff)
downloadhercules-74d9eeee60543806e8902812349bcc67e1ddead1.tar.gz
hercules-74d9eeee60543806e8902812349bcc67e1ddead1.tar.bz2
hercules-74d9eeee60543806e8902812349bcc67e1ddead1.tar.xz
hercules-74d9eeee60543806e8902812349bcc67e1ddead1.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/battle.h')
-rw-r--r--src/map/battle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 707868e43..f2d870032 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -67,7 +67,7 @@ enum e_battle_check_target { //New definitions [Skotlex]
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
+ BCT_ALL = 0x1f0000, // Sum of BCT_NOONE to BCT_NEUTRAL
};
/**