diff options
author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-07-21 21:07:49 +0800 |
---|---|---|
committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-07-21 21:07:49 +0800 |
commit | 760faf643731de9d38623dce4d129375801f8b33 (patch) | |
tree | 12a748aa89937f240f9c8eba472e58501f94008f /src/map/npc.h | |
parent | 8b00d9bd079514a1c307ef5d2e6614055e8f874e (diff) | |
parent | fe946e819d935ca92208e32b6b2766ec92b30601 (diff) | |
download | hercules-760faf643731de9d38623dce4d129375801f8b33.tar.gz hercules-760faf643731de9d38623dce4d129375801f8b33.tar.bz2 hercules-760faf643731de9d38623dce4d129375801f8b33.tar.xz hercules-760faf643731de9d38623dce4d129375801f8b33.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
-rw-r--r-- | src/map/npc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 16e6fe74c..48c27b297 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -99,7 +99,7 @@ enum actor_classes //Checks if a given id is a valid npc id. [Skotlex] //Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001) -#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS || ( (id) > 10000 && (id) < 10049 ) ) +#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS || ( (id) > MAX_NPC_CLASS2_START && (id) < MAX_NPC_CLASS2_END ) ) #ifdef PCRE_SUPPORT void npc_chat_finalize(struct npc_data* nd); |