diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-14 15:08:54 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-14 15:08:54 +0000 |
| commit | f3990e452520e98b6c24167dc8d84e36bee84066 (patch) | |
| tree | 7ac16b160ae2a1ed99f019cc82782227880db2f9 | |
| parent | 33ef1aa65495269c552827c8b89f2ac503a570f2 (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9fad57ece..2d5c675fd 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/03/14 + * 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). [Ai4rei] 2011/03/13 * Script commands documentation updates. [Ai4rei] - Added missing description for script command 'cooking' provided by Masao (bugreport:3372, follow up to r13628). 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; } |