summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-12 21:14:28 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-12 21:14:28 +0000
commit3c9a4b95c3612e0925baf1b116460e0c07cd6d2f (patch)
treee958d75a53e32c98f8c67550e81b781a96c97cf8 /src/map/npc.c
parent05d3b8fa90b371b23db1b934945837276b3ab545 (diff)
downloadhercules-3c9a4b95c3612e0925baf1b116460e0c07cd6d2f.tar.gz
hercules-3c9a4b95c3612e0925baf1b116460e0c07cd6d2f.tar.bz2
hercules-3c9a4b95c3612e0925baf1b116460e0c07cd6d2f.tar.xz
hercules-3c9a4b95c3612e0925baf1b116460e0c07cd6d2f.zip
- Fixed npc_checknear's distance check returning the opposite of what it should (false when the range is correct and viceversa)
- SL_STIN/SL_STUN have dex-reducable casting times now. - Added a warning on item loading when an item is of equippable type but has no equippable position. - Turning an alliance to an opposition won't work now during WoE - Slaves can summon other mobs now. The only ones who can't do this are player summoned mobs. - Merged the following functions for faster processing of items: clif_storageitemlist + clif_storageequiplist = clif_storagelist clif_guildstorageitemlist + clif_guildstorageequiplist = clif_guildstoragelist clif_itemlist + clif_equiplist = clif_inventorylist - Increased max knockback value support to 25. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7109 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index b8f86e88f..8e4182615 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1048,9 +1048,9 @@ TBL_NPC *npc_checknear(struct map_session_data *sd,struct block_list *bl)
if (bl->m!=sd->bl.m ||
bl->x<sd->bl.x-AREA_SIZE-1 || bl->x>sd->bl.x+AREA_SIZE+1 ||
bl->y<sd->bl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)
- return nd;
+ return NULL;
- return NULL;
+ return nd;
}
/*==========================================