From e28801d3e47703d7c49e3e4b6eb016fb87f099f3 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Fri, 2 Oct 2009 01:56:56 +0000 Subject: Fixed a damage underflow (bugreport:3624) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14077 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/battle.c | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index d67971cbc..bc7317392 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +09/10/02 + * Fixed a damage underflow.(bugreport:3624) [Inkfish] 09/09/23 * Added supports for Soul Bound. [Inkfish] 09/09/21 diff --git a/src/map/battle.c b/src/map/battle.c index b80616803..b65a5fcde 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1840,12 +1840,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo } if (def1 > 100) def1 = 100; ATK_RATE2( - flag.idef ?100: - (flag.pdef ?flag.pdef *(def1 + vit_def): - 100-def1), - flag.idef2?100: - (flag.pdef2?flag.pdef2*(def1 + vit_def): - 100-def1) + flag.idef ?100:(flag.pdef ?(int)(flag.pdef *(def1+vit_def)):(100-def1)), + flag.idef2?100:(flag.pdef2?(int)(flag.pdef2*(def1+vit_def)):(100-def1)) ); ATK_ADD2( flag.idef ||flag.pdef ?0:-vit_def, -- cgit v1.2.3-70-g09d2