From d436404bd7279a831804f0536e97e29dd484f7bb Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 23 May 2011 07:12:02 +0000 Subject: * Changed enumerating defines into enumerations (related topic:264007). - Minor fixups on few macros. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14831 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/npc.h') diff --git a/src/map/npc.h b/src/map/npc.h index 6e7c7cbeb..9c0696753 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); -- cgit v1.2.3-60-g2f50