diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 14:13:26 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 14:13:26 +0000 |
| commit | 4d0d981ae30ca3b643e8727e2e5087b957e5d27a (patch) | |
| tree | 3842a643265d4992875707782d83117144316ad2 /src/map/status.h | |
| parent | 13e152b1a9819d6587c9702b7eccd174e62b5e8b (diff) | |
| download | hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.tar.gz hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.tar.bz2 hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.tar.xz hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.zip | |
- Re-committed r16981/trunk/src/ and follow up r16988/trunk/src/ (pid:161281).
-Fix previous recommit since r16995
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16999 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.h')
| -rw-r--r-- | src/map/status.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/map/status.h b/src/map/status.h index 402dfc690..82bd7ba8a 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1567,6 +1567,9 @@ struct weapon_atk { unsigned short atk, atk2; unsigned short range; unsigned char ele; +#ifdef RENEWAL + unsigned short matk, wlv; +#endif }; @@ -1596,12 +1599,6 @@ 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; struct weapon_atk rhw, lhw; //Right Hand/Left Hand Weapon. @@ -1752,12 +1749,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); @@ -1812,6 +1803,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); |