diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 19:30:15 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 19:30:15 +0000 |
| commit | bb78f61a194f92934784d108cb8e54e391c570aa (patch) | |
| tree | 2e49643974eca093697308c944ff3ba0622922ea /src/map/skill.c | |
| parent | 06387a85ce94281d1652ab4bc61c5b9c0971832a (diff) | |
| download | hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.gz hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.bz2 hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.xz hercules-bb78f61a194f92934784d108cb8e54e391c570aa.zip | |
- 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
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index db62dd23e..6e9d5c9ff 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6863,8 +6863,13 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned skill_delunitgroup(NULL, sg); } } - } else if(battle_config.mob_warpportal && bl->type != BL_PET) - unit_warp(bl,map_mapindex2mapid(sg->val3),sg->val2>>16,sg->val2&0xffff,3); + } else + if(bl->type == BL_MOB && battle_config.mob_warp&2) + { + int m = map_mapindex2mapid(sg->val3); + if (m < 0) break; //Map not available on this map-server. + unit_warp(bl,m,sg->val2>>16,sg->val2&0xffff,3); + } break; case UNT_QUAGMIRE: |