diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-25 19:37:16 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-25 19:37:16 +0000 |
| commit | 1c673543fea7ad386a52df4507c6b7c9651b8002 (patch) | |
| tree | 388b07ea7d18bc2432285fb3eb163b252bc0c172 /src/map | |
| parent | e3883970149cfbb3a1e89b99a32dfd5de6fbdfd0 (diff) | |
| download | hercules-1c673543fea7ad386a52df4507c6b7c9651b8002.tar.gz hercules-1c673543fea7ad386a52df4507c6b7c9651b8002.tar.bz2 hercules-1c673543fea7ad386a52df4507c6b7c9651b8002.tar.xz hercules-1c673543fea7ad386a52df4507c6b7c9651b8002.zip | |
Fixed 'bonus bMatk,<value>;' bonus, follow up r15270
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15275 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/status.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c index 54a971dff..db204f2f9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2530,13 +2530,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first) //Equipment modifiers for misc settings if(sd->matk_rate < 0) sd->matk_rate = 0; -#if REMODE - /** - * in RE matk_min is used as character's base matk - * sp_base_matk is 'bonus bMatk,<boost>' - **/ - status->matk_min += sd->sp_base_matk; -#endif + if(sd->matk_rate != 100){ status->matk_max = status->matk_max * sd->matk_rate/100; status->matk_min = status->matk_min * sd->matk_rate/100; @@ -3345,6 +3339,12 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag) //New matk #if REMODE status->matk_min = status_base_matk_min(status,status_get_lv(bl)); + /** + * in RE matk_min is used as character's base matk + * sp_base_matk is 'bonus bMatk,<boost>' + **/ + if( sd ) + status->matk_min += sd->sp_base_matk; #else status->matk_min = status_base_matk_min(status); #endif |