diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-03 06:45:13 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-03 06:45:13 +0000 |
| commit | a19256ad9e618ba780b6906e11afd143939d9a74 (patch) | |
| tree | d5ddb1377723d5da4216eca534f300f7f9bf14ce | |
| parent | 37be6304d98af09931c2deb6f33d1c7c716901ac (diff) | |
| download | hercules-a19256ad9e618ba780b6906e11afd143939d9a74.tar.gz hercules-a19256ad9e618ba780b6906e11afd143939d9a74.tar.bz2 hercules-a19256ad9e618ba780b6906e11afd143939d9a74.tar.xz hercules-a19256ad9e618ba780b6906e11afd143939d9a74.zip | |
* Corrected npcdb_checkid to exclude border constants 400 (JT_NEW_NPC_START) and 1000 (JT_MON_BEGIN) (since r4425 and r12025, related r4537).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14882 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/npc.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 4a4facb81..4fc5fb6b5 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/07/03 + * Corrected npcdb_checkid to exclude border constants 400 (JT_NEW_NPC_START) and 1000 (JT_MON_BEGIN) (since r4425 and r12025, related r4537). [Ai4rei] 2011/07/02 * Fixed minor stuff in login/char converter VS6 project files (since r14858). [Ai4rei] * More instancing updates. [Ai4rei] diff --git a/src/map/npc.h b/src/map/npc.h index 9c0696753..29e3d79cb 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -77,7 +77,7 @@ struct npc_data { #define MAX_NPC_CLASS 1000 //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) == 139 || ( (id) >= 400 && (id) <= MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS ) +#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == 139 || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS ) #ifdef PCRE_SUPPORT void npc_chat_finalize(struct npc_data* nd); |