From bb78f61a194f92934784d108cb8e54e391c570aa Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 4 Aug 2006 19:30:15 +0000 Subject: - Removed settings enemy_critical_rate, homun_critical_rate. Added settings enable_critical (defaults to specify only players), mob_critical_rate and critical_rate. The last applies to all non-mobs and non-players (battle/battle.conf) - Removed settings mob_npc_warp, mob_warpportal. Replaced with setting mob_warp which specifies which types of warp can a mob step into (battle/monster.conf) - Updated status_calc_misc so that it also handles the BL_PC case, removed redundant info from status_calc_pc, and moving the SNovice Max Hp bonus to status_base_pc_maxhp git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8135 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index af22a84de..ef8dbf8be 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1004,10 +1004,9 @@ int npc_touch_areanpc2(struct block_list *bl) 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); + if (unit_warp(bl, xs, map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0)) + return 0; //Failed to warp. + return 1; } -- cgit v1.2.3-60-g2f50