From 8f98ecea38aa77e4d0fb53bae0dc6052289b24a8 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Mon, 2 Jun 2008 15:54:50 +0000 Subject: - Added support for OnTouchNPC event, required for Monster Race. Script commands need to be tested. Already tested sc_start. - Added status SC_WALKSPEED required in monster Race. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12752 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/unit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 1c21c5300..06a0a07bf 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -183,9 +183,10 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data) bl->id, sd->status.guild_id, strvit, agidex); } } else if (md) { - if(battle_config.mob_warp&1 && map_getcell(bl->m,x,y,CELL_CHKNPC) && - npc_touch_areanpc2(bl)) // Enable mobs to step on warps. [Skotlex] - return 0; + if( map_getcell(bl->m,x,y,CELL_CHKNPC) ) { + if( npc_touch_areanpc2(md) ) return 0; // Warped + } else + md->areanpc_id = 0; if (md->min_chase > md->db->range3) md->min_chase--; //Walk skills are triggered regardless of target due to the idle-walk mob state. //But avoid triggering on stop-walk calls. -- cgit v1.2.3-70-g09d2