summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-06 19:54:50 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-06 19:54:50 +0000
commitb565f6ab9ba86952cca14355e9702991fc755fd2 (patch)
treecdf13d310c1b42cd1dc190dd0111f0bd0be59dfd /src/map
parent9e404a1d5018b771ff55d7e96d86be04046728dd (diff)
downloadhercules-b565f6ab9ba86952cca14355e9702991fc755fd2.tar.gz
hercules-b565f6ab9ba86952cca14355e9702991fc755fd2.tar.bz2
hercules-b565f6ab9ba86952cca14355e9702991fc755fd2.tar.xz
hercules-b565f6ab9ba86952cca14355e9702991fc755fd2.zip
Fixed Monster SkilL Crash bugreport:5101
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15019 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 556b51bbd..10105ba94 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2707,8 +2707,8 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
* yes this formula MATCHES their site: matk_max already holds weaponmatk+upgradematk, and
* -> statusMATK holds the %Matk modifier stuff from earlier and lastly:
* -> the mdef part is not applied at this point, but later.
- **/
- MATK_ADD(sstatus->matk_max * 2 + 15/10 * sstatus->matk_min + rand()% ( sstatus->matk_max + (sstatus->matk_max*sstatus->wlv) / 10 * 2 * 10/15 * sstatus->matk_min ) );
+ **/ //1:bugreport:5101 //1:bugreport:5101
+ MATK_ADD((1+sstatus->matk_max) * 2 + 15/10 * sstatus->matk_min + rand()% ( sstatus->matk_max + (1 + (sstatus->matk_max*sstatus->wlv) / 10 * 2 * 10/15 * sstatus->matk_min ) ));
#else //Ancient MATK Appliance
if (sstatus->matk_max > sstatus->matk_min) {
MATK_ADD(sstatus->matk_min+rand()%(1+sstatus->matk_max-sstatus->matk_min));