summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 23:26:14 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 23:26:14 +0000
commit08d3a24b80ebb31e46d623118b335a86cf37f425 (patch)
tree2b8e049aedd4a720aafc395a30983206f3e6292e /src/map/map.h
parent9bf4c93d86a081c0c1254613d5115e8210e035ec (diff)
downloadhercules-08d3a24b80ebb31e46d623118b335a86cf37f425.tar.gz
hercules-08d3a24b80ebb31e46d623118b335a86cf37f425.tar.bz2
hercules-08d3a24b80ebb31e46d623118b335a86cf37f425.tar.xz
hercules-08d3a24b80ebb31e46d623118b335a86cf37f425.zip
- Mercenary Dismiss packet and some corrections.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13127 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h
index bb4b0a94c..b880b8bf4 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -182,7 +182,7 @@ enum bl_type {
};
//For common mapforeach calls. Since pets cannot be affected, they aren't included here yet.
-#define BL_CHAR (BL_PC|BL_MOB|BL_HOM)
+#define BL_CHAR (BL_PC|BL_MOB|BL_HOM|BL_MER)
enum npc_subtype { WARP, SHOP, SCRIPT, CASHSHOP };