diff options
| author | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
| commit | 8c3c4577bde31ccee677ea75649b89cfa5822240 (patch) | |
| tree | 6f1c3cf85deea0932b974d5a8943184966bff46a /src/map/npc.h | |
| parent | 3a6517e14649805db47b332934f4cad972d00e95 (diff) | |
| parent | 038174e232c03519474f86e5738cecac34bbdee3 (diff) | |
| download | hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.gz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.bz2 hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.xz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index c2351a836..8800b4e5b 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -88,7 +88,12 @@ enum actor_classes INVISIBLE_CLASS = 32767, }; +// Old NPC range #define MAX_NPC_CLASS 1000 +// New NPC range +#define MAX_NPC_CLASS2_START 10000 +#define MAX_NPC_CLASS2_END 10049 + //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 ) ) @@ -174,7 +179,7 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, uns /** * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ -#if SECURE_NPCTIMEOUT +#ifdef SECURE_NPCTIMEOUT int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data); #endif |