diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/npc.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 69c67e0b6..7ff911790 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,7 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/01/06 - * Fixed a visual itemdupple bug on mail system. + * Extended the id range for npcs, now [400,700) will also be treated + as NPC objects (see topic:170845 and bugreport:727) [ultramage] + * Fixed a visual itemdupple bug on mail system. [Zephyrus] - Fixed Overthrush status cannot being recalled at same skill lvl. 2008/01/04 * Fixed a mistake in r11991 that let knockback work through walls diff --git a/src/map/map.c b/src/map/map.c index a3757101d..38ed332af 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2338,7 +2338,7 @@ int map_readfromcache(struct map_data *m, FILE *fp) if( i < header.map_count ) { unsigned char *buf, *buf2; - unsigned int size, xy; + unsigned long size, xy; m->xs = info.xs; m->ys = info.ys; diff --git a/src/map/npc.h b/src/map/npc.h index a0c1956b7..f74575368 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -19,7 +19,7 @@ struct view_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 >= 700 && 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); |