From 75176f384099d90c1624df3c7878192ffd070663 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Wed, 28 Apr 2010 09:10:04 +0000 Subject: Fixed OnTouch doesn't trigger on hiding characters. (bugreport:4208) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14291 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/npc.c b/src/map/npc.c index 15434f357..aa9bfd228 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -107,8 +107,11 @@ int npc_ontouch_event(struct map_session_data *sd, struct npc_data *nd) { char name[NAME_LENGTH*2+3]; - if( nd->touching_id || pc_ishiding(sd) ) - return 0; + if( nd->touching_id ) + return 0; // Attached a player already. Can't trigger on anyone else. + + if( pc_ishiding(sd) ) + return 1; // Can't trigger 'OnTouch_'. try 'OnTouch' later. snprintf(name, ARRAYLENGTH(name), "%s::%s", nd->exname, script_config.ontouch_name); return npc_event(sd,name,1); -- cgit v1.2.3-60-g2f50