From 6ba74869059cbb98ab138be5174eb38bc11f5caf Mon Sep 17 00:00:00 2001 From: Arthur Dene Ice Date: Wed, 7 May 2014 17:26:08 -0700 Subject: [PATCH] explicit conversions float to int explicit conversion Explicit conversion float to int32 double to float explicit conversion float to int explicit conversion float to int explicit conversion float to int explicit conversion Explicit conversion float to int32 double to float explicit conversion --- zone/bot.cpp | 8 ++++---- zone/mob.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index 30d32e15c..9ebd6d55e 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -1405,17 +1405,17 @@ int32 Bot::GenerateBaseHitPoints() if(level < 41) { - new_base_hp = (int)(5 + (GetLevel() * hp_factor / 12) + ((NormalSTA - SoDPost255) * GetLevel() * hp_factor / 3600)); + new_base_hp = (5 + (GetLevel() * hp_factor / 12) + ((NormalSTA - SoDPost255) * GetLevel() * hp_factor / 3600)); } else if(level < 81) { - new_base_hp = (int)(5 + (40 * hp_factor / 12) + ((GetLevel() - 40) * hp_factor / 6) + + new_base_hp = (5 + (40 * hp_factor / 12) + ((GetLevel() - 40) * hp_factor / 6) + ((NormalSTA - SoDPost255) * hp_factor / 90) + ((NormalSTA - SoDPost255) * (GetLevel() - 40) * hp_factor / 1800)); } else { - new_base_hp = (int)(5 + (80 * hp_factor / 8) + ((GetLevel() - 80) * hp_factor / 10) + + new_base_hp = (5 + (80 * hp_factor / 8) + ((GetLevel() - 80) * hp_factor / 10) + ((NormalSTA - SoDPost255) * hp_factor / 90) + ((NormalSTA - SoDPost255) * hp_factor / 45)); } @@ -6550,7 +6550,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b damage, min_hit, max_hit, GetSTR(), GetSkill(skillinuse), weapon_damage, GetLevel()); if(opts) { - damage *= (int)opts->damage_percent; + damage *= opts->damage_percent; damage += opts->damage_flat; hate *= opts->hate_percent; hate += opts->hate_flat; diff --git a/zone/mob.cpp b/zone/mob.cpp index 95416914d..79ebebde6 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -2076,7 +2076,7 @@ void Mob::SetAttackTimer() { if(max_quiver > 0) { float quiver_haste = 1 / (1 + max_quiver / 100); - speed *= (int)quiver_haste; + speed = (int)(speed * quiver_haste); } } }