From 58a012ef888ec1b80c714636f64648ba1e272b18 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 30 May 2006 18:25:55 +0000 Subject: - Updated attr_fix_table reading code to account for ELE_MAX (will correctly read bigger elemental tables if ELE_MAX is changed) - Aggressive mobs will now use battle_check_range rather than mob_can_reach to decide whether to lock-on or not to a target within sight-range. - Added warnings in mob_readdb when the mob's element is invalid. - Updated the corresponding entries in map.h to use ELE_MAX - Added error messages in pc_bonus* functions when an invalid element is passed to the relevant bonuses. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6856 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 52aee5c69..4ae6ea545 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -27,7 +27,7 @@ #define is_boss(bl) status_get_mexp(bl) // Can refine later [Aru] -int attr_fix_table[4][10][10]; +int attr_fix_table[4][ELE_MAX][ELE_MAX]; struct Battle_Config battle_config; static struct eri *delay_damage_ers; //For battle delay damage structures. @@ -189,39 +189,6 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag def_lv < 1 || def_lv > 4) { if (battle_config.error_log) ShowError("battle_attr_fix: unknown attr type: atk=%d def_type=%d def_lv=%d\n",atk_elem,def_type,def_lv); - //TODO: Remove this debug case once the cause is resolved. [Skotlex] - if (src) switch (src->type) { - case BL_MOB: - ShowDebug("src: Mob %s-%d\n", ((struct mob_data*)src)->name, ((struct mob_data*)src)->class_); - break; - case BL_PC: - ShowDebug("src: Player %s-%d\n", ((struct map_session_data*)src)->status.name, ((struct map_session_data*)src)->bl.id); - break; - case BL_PET: - ShowDebug("src: Pet %s-%d\n", ((struct pet_data*)src)->name, ((struct pet_data*)src)->bl.id); - break; - case BL_SKILL: - ShowDebug("src: Ground Skill id: %d\n", ((struct skill_unit*)src)->group->skill_id); - break; - default: - ShowDebug("unknown source type %d.\n", src->type); - } - if (target) switch (target->type) { - case BL_MOB: - ShowDebug("target: Mob %s-%d\n", ((struct mob_data*)target)->name, ((struct mob_data*)target)->class_); - break; - case BL_PC: - ShowDebug("target: Player %s-%d\n", ((struct map_session_data*)target)->status.name, ((struct map_session_data*)target)->bl.id); - break; - case BL_PET: - ShowDebug("target: Pet %s-%d\n", ((struct pet_data*)target)->name, ((struct pet_data*)target)->bl.id); - break; - case BL_SKILL: - ShowDebug("target: Ground Skill id: %d\n", ((struct skill_unit*)target)->group->skill_id); - break; - default: - ShowDebug("unknown target type %d.\n", target->type); - } return damage; } -- cgit v1.2.3-60-g2f50