diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-23 07:12:02 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-23 07:12:02 +0000 |
| commit | d436404bd7279a831804f0536e97e29dd484f7bb (patch) | |
| tree | afd48d6a8e0aa78fb54743b3c179e5ef3f1cf65c /src/map/npc.h | |
| parent | bc6ac0943bd618ae8cc484ba517d75d417e612a7 (diff) | |
| download | hercules-d436404bd7279a831804f0536e97e29dd484f7bb.tar.gz hercules-d436404bd7279a831804f0536e97e29dd484f7bb.tar.bz2 hercules-d436404bd7279a831804f0536e97e29dd484f7bb.tar.xz hercules-d436404bd7279a831804f0536e97e29dd484f7bb.zip | |
* 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
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 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); |