From 857c86d93ebd68e5edbbe14ce26a16a967622822 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 23:10:21 +0300 Subject: map: fix check for correct npc id. After server update need update this check. --- src/map/npc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/npc.c b/src/map/npc.c index daa1630..64ee0f3 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -115,5 +115,13 @@ bool enpc_db_checkid(int *idPtr) { const int id = *idPtr; hookStop(); - return ((id >= 46 && id < MAX_NPC_CLASS) || id == HIDDEN_WARP_CLASS || id == INVISIBLE_CLASS || (id > MAX_NPC_CLASS2_START && id < MAX_NPC_CLASS2_END)); + + if (id == HIDDEN_WARP_CLASS || id == INVISIBLE_CLASS) // Special IDs not included in the valid ranges + return true; + if (id >= 45 && id < MAX_NPC_CLASS) // Second subrange + return true; + if (id >= MAX_NPC_CLASS2_START && id < MAX_NPC_CLASS2_END) // Second range + return true; + // Anything else is invalid + return false; } -- cgit v1.2.3-70-g09d2