From 69ca5fffbb6a940b9c5b7753c6c57d2c9c5b5abe Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 29 May 2006 18:08:07 +0000 Subject: - Updated max_def parameter to not apply to mdef if magic_defense_type is set (rather than weapon_defense_type) - Updated comment description for config setting max_def - Fixed battle_check_target check on BCT_ALL to check versus BL_CHAR instead of BL_PC and BL_MOB git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6826 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 8 +++----- src/map/status.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/map/battle.c b/src/map/battle.c index 5e2a0d1b6..52e82ce9f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -25,8 +25,6 @@ #include "guild.h" #include "party.h" -#include "mercenary.h" - #define is_boss(bl) status_get_mexp(bl) // Can refine later [Aru] int attr_fix_table[4][10][10]; @@ -3154,7 +3152,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f if (t_bl->type == BL_MOB && !((TBL_MOB*)t_bl)->special_state.ai) state |= BCT_ENEMY; //Default enemy. Normal mobs. //Pass on to master. - s_bl=(struct block_list *)((struct homun_data*)src)->master; //Whoever is the master's enemy is the homunculus' enemy. + s_bl=(struct block_list *)((struct homun_data*)src)->master; break; } case BL_PET: @@ -3176,8 +3174,8 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f return 0; } - if ((flag&BCT_ALL) == BCT_ALL) { //All actually stands for all players/mobs - if (target->type == BL_MOB || target->type == BL_PC) + if ((flag&BCT_ALL) == BCT_ALL) { //All actually stands for all attackable chars + if (target->type&BL_CHAR) return 1; else return -1; diff --git a/src/map/status.c b/src/map/status.c index 13106ccd6..1af6228b1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1718,7 +1718,7 @@ int status_calc_pc(struct map_session_data* sd,int first) if(sd->mdef_rate != 100) status->mdef = status->mdef * sd->mdef_rate/100; - if (!battle_config.weapon_defense_type && status->mdef > battle_config.max_def) + if (!battle_config.magic_defense_type && status->mdef > battle_config.max_def) { status->mdef2 += battle_config.over_def_bonus*(status->mdef -battle_config.max_def); status->mdef = (unsigned char)battle_config.max_def; -- cgit v1.2.3-70-g09d2