From febdcd8873ad1198e80f6a3a4a4f55f2cc557911 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 8 Jun 2006 15:44:04 +0000 Subject: - Updated mob_npc_warp to a three-state config switch. 0 disables. 1 enable only on warps that don't lead to nobranch maps. 2 - enable on all warps. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7048 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index e9e472721..e9ddb3e53 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -996,6 +996,10 @@ int npc_touch_areanpc2(struct block_list *bl) xs = map_mapindex2mapid(map[m].npc[i]->u.warp.mapindex); if (xs < 0) // Can't warp object between map servers... return 0; + + if(battle_config.mob_npc_warp<2 && map[xs].flag.nobranch) + return 0; //Disable warps to nobranch maps. + unit_warp(bl, xs, map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0); return 1; } -- cgit v1.2.3-70-g09d2