summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-14 15:08:54 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-14 15:08:54 +0000
commitf3990e452520e98b6c24167dc8d84e36bee84066 (patch)
tree7ac16b160ae2a1ed99f019cc82782227880db2f9 /src/map
parent33ef1aa65495269c552827c8b89f2ac503a570f2 (diff)
downloadhercules-f3990e452520e98b6c24167dc8d84e36bee84066.tar.gz
hercules-f3990e452520e98b6c24167dc8d84e36bee84066.tar.bz2
hercules-f3990e452520e98b6c24167dc8d84e36bee84066.tar.xz
hercules-f3990e452520e98b6c24167dc8d84e36bee84066.zip
* Fixed a typo in npc_touchnext_areanpc (NPC's map being used as it's x-coordinate), which caused ::OnTouch_ invokation to affect different area than intended (bugreport:4814, since r14097).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14743 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index bc2018459..77143eaed 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -813,7 +813,7 @@ int npc_touchnext_areanpc(struct map_session_data* sd, bool leavemap)
nd->touching_id = sd->touching_id = 0;
snprintf(name, ARRAYLENGTH(name), "%s::%s", nd->exname, script_config.ontouch_name);
- map_forcountinarea(npc_touch_areanpc_sub,nd->bl.m,nd->bl.m - xs,nd->bl.y - ys,nd->bl.x + xs,nd->bl.y + ys,1,BL_PC,sd->bl.id,nd->bl.id,name);
+ map_forcountinarea(npc_touch_areanpc_sub,nd->bl.m,nd->bl.x - xs,nd->bl.y - ys,nd->bl.x + xs,nd->bl.y + ys,1,BL_PC,sd->bl.id,nd->bl.id,name);
}
return 0;
}