From 9b02e0156ddee963d690b21fb98549cea0a0ccda Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Thu, 29 Nov 2012 16:03:55 +0000 Subject: Fixed bugreport:5689 recoded/reimplement RE Matk formula(including RE Heal) Fixed bugreport:5745 WL_RECOGNIZED us now functional. Fixed bugreport:5663 where HW_MAGICPOWER shows glitch in status window. Fixed bugreport:6759 where items granting matk bonus didn't work. Follow up r16980 small performance enhancement...:) Done some TODO in skill_cast_db.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16981 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src/map/status.h') diff --git a/src/map/status.h b/src/map/status.h index 9343b4f78..130b858e0 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1563,6 +1563,9 @@ struct weapon_atk { unsigned short atk, atk2; unsigned short range; unsigned char ele; +#ifdef RENEWAL + unsigned short matk, wlv; +#endif }; @@ -1592,13 +1595,7 @@ struct status_data { unsigned char def_ele, ele_lv, -#ifdef RENEWAL - /** - * in RE weapon level is used in several areas, keeping it here saves performance - **/ - wlv, -#endif - size, race; + size, race; struct weapon_atk rhw, lhw; //Right Hand/Left Hand Weapon. }; @@ -1748,12 +1745,6 @@ unsigned char status_calc_attack_element(struct block_list *bl, struct status_ch #define status_get_race(bl) status_get_status_data(bl)->race #define status_get_size(bl) status_get_status_data(bl)->size #define status_get_mode(bl) status_get_status_data(bl)->mode -#ifdef RENEWAL -/** - * in RE weapon level is used in several areas, keeping it here saves performance - **/ -#define status_get_wlv(bl) status_get_status_data(bl)->wlv -#endif int status_get_party_id(struct block_list *bl); int status_get_guild_id(struct block_list *bl); int status_get_emblem_id(struct block_list *bl); @@ -1808,6 +1799,10 @@ int status_check_visibility(struct block_list *src, struct block_list *target); int status_change_spread(struct block_list *src, struct block_list *bl); +#ifdef RENEWAL +unsigned short status_base_matk(const struct status_data* status, int level); +#endif + int status_readdb(void); int do_init_status(void); void do_final_status(void); -- cgit v1.2.3-60-g2f50