- 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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/map/map.h b/src/map/map.h
index b323b1a7e..5e986fa01 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -463,7 +463,7 @@ struct weapon_data {
 	int ignore_def_race;

 	int def_ratio_atk_ele;

 	int def_ratio_atk_race;

-	int addele[10];

+	int addele[ELE_MAX];

 	int addrace[RC_MAX];

 	int addrace2[RC_MAX];

 	int addsize[3];

@@ -622,23 +622,23 @@ struct map_session_data {
 	

 	// here start arrays to be globally zeroed at the beginning of status_calc_pc()

 	int param_bonus[6],param_equip[6]; //Stores card/equipment bonuses.

-	int subele[10];

+	int subele[ELE_MAX];

 	int subrace[RC_MAX];

 	int subrace2[RC_MAX];

 	int subsize[3];

 	int addeff[SC_COMMON_MAX-SC_COMMON_MIN+1];

 	int addeff2[SC_COMMON_MAX-SC_COMMON_MIN+1];

 	int reseff[SC_COMMON_MAX-SC_COMMON_MIN+1];

-	int weapon_coma_ele[10];

+	int weapon_coma_ele[ELE_MAX];

 	int weapon_coma_race[RC_MAX];

 	int weapon_atk[16];

 	int weapon_atk_rate[16];

-	int arrow_addele[10];

+	int arrow_addele[ELE_MAX];

 	int arrow_addrace[RC_MAX];

 	int arrow_addsize[3];

 	int arrow_addeff[SC_COMMON_MAX-SC_COMMON_MIN+1];

 	int arrow_addeff2[SC_COMMON_MAX-SC_COMMON_MIN+1];

-	int magic_addele[10];

+	int magic_addele[ELE_MAX];

 	int magic_addrace[RC_MAX];

 	int magic_addsize[3];

 	int critaddrace[RC_MAX];