summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDastgir <dastgirpojee@rocketmail.com>2015-01-30 11:06:49 +0530
committerDastgir <dastgirpojee@rocketmail.com>2015-01-30 11:06:49 +0530
commit3d47fdff7ddae8e5f028425c653dccc4ecfcfed5 (patch)
tree6757e32cf1854e0d10919d2fcf45c8c0dc842b92 /src
parent1ba9c437f2541012a9e54a30424f76495f331842 (diff)
parent8a8d16266a9069046b78c1fea4369499303b3f2c (diff)
downloadhercules-3d47fdff7ddae8e5f028425c653dccc4ecfcfed5.tar.gz
hercules-3d47fdff7ddae8e5f028425c653dccc4ecfcfed5.tar.bz2
hercules-3d47fdff7ddae8e5f028425c653dccc4ecfcfed5.tar.xz
hercules-3d47fdff7ddae8e5f028425c653dccc4ecfcfed5.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index d32a799ab..74dfde41d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2452,7 +2452,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
case GN_CART_TORNADO:
{
int strbonus = bst->str;
- skillratio = 50 * skill_lv + (sd ? sd->cart_weight : battle_config.max_cart_weight) / 10 / (150 - strbonus) + 50 * (sd ? pc->checkskill(sd, GN_REMODELING_CART) : 5);
+ skillratio = 50 * skill_lv + (sd ? sd->cart_weight : battle_config.max_cart_weight) / 10 / max(150 - strbonus, 1) + 50 * (sd ? pc->checkskill(sd, GN_REMODELING_CART) : 5);
}
break;
case GN_CARTCANNON: