diff options
| author | shennetsind <notind@gmail.com> | 2013-07-18 17:49:39 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-07-18 17:49:39 -0700 |
| commit | 860c36ea6474c0d5bc532182baec8414ed35fbf6 (patch) | |
| tree | 8a0b55141d016c304066b330cce6e35fcb6073ed | |
| parent | c600af3ad4cdce4bf8f6f153c2599fca9902d426 (diff) | |
| parent | fabedc8b22fdad8b6e2154c1c1f03eb2b6aac359 (diff) | |
| download | hercules-860c36ea6474c0d5bc532182baec8414ed35fbf6.tar.gz hercules-860c36ea6474c0d5bc532182baec8414ed35fbf6.tar.bz2 hercules-860c36ea6474c0d5bc532182baec8414ed35fbf6.tar.xz hercules-860c36ea6474c0d5bc532182baec8414ed35fbf6.zip | |
Merge pull request #60 from kisuka/master
Changed npcdb_checkid to use MAX_NPC_CLASS2_START and MAX_NPC_CLASS2_END.
| -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); |