summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-04 13:17:08 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-04 13:17:08 +0000
commit65d3824a9e6732760ce0e12201f8b856e097d08e (patch)
tree50d3a303149dd7c6f904166fb743d2d0a63dac87 /src/map/map.h
parentadb0530acc2d47f904297133808b3f48fff1a6a1 (diff)
downloadhercules-65d3824a9e6732760ce0e12201f8b856e097d08e.tar.gz
hercules-65d3824a9e6732760ce0e12201f8b856e097d08e.tar.bz2
hercules-65d3824a9e6732760ce0e12201f8b856e097d08e.tar.xz
hercules-65d3824a9e6732760ce0e12201f8b856e097d08e.zip
* Extended ATF_SKILL to ATF_MAGIC and ATF_MISC.
* r13932 Fixed a wrong check on hp in Intimidate code. (bugreport:3305) (I forgot to write the message.) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13933 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h
index ca40bdd98..8e02becbd 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -226,7 +226,8 @@ enum auto_trigger_flag {
ATF_SHORT=0x04,
ATF_LONG=0x08,
ATF_WEAPON=0x10,
- ATF_SKILL=0x20,
+ ATF_MAGIC=0x20,
+ ATF_MISC=0x40,
};
struct block_list {