pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 09:28:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

int32 to float explicit conversion

Browse Source
This commit is contained in:
Arthur Dene Ice
2014-05-05 20:59:22 -07:00
parent 30264aa099
commit 0cd90dfafe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+6 -6
View File
@@ -552,7 +552,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttac
int armor = 0; int armor = 0;
float weight = 0.0; float weight = 0.0;
float monkweight = RuleI(Combat, MonkACBonusWeight); float monkweight = (float)RuleI(Combat, MonkACBonusWeight);
monkweight = mod_monk_weight(monkweight, attacker); monkweight = mod_monk_weight(monkweight, attacker);
if (IsClient()) { if (IsClient()) {
@@ -575,16 +575,16 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttac
if (RuleB(Combat, OldACSoftcapRules)) { if (RuleB(Combat, OldACSoftcapRules)) {
if (GetClass() == WIZARD || GetClass() == MAGICIAN || if (GetClass() == WIZARD || GetClass() == MAGICIAN ||
GetClass() == NECROMANCER || GetClass() == ENCHANTER) GetClass() == NECROMANCER || GetClass() == ENCHANTER)
softcap = RuleI(Combat, ClothACSoftcap); softcap = (float)RuleI(Combat, ClothACSoftcap);
else if (GetClass() == MONK && weight <= monkweight) else if (GetClass() == MONK && weight <= monkweight)
softcap = RuleI(Combat, MonkACSoftcap); softcap = (float)RuleI(Combat, MonkACSoftcap);
else if(GetClass() == DRUID || GetClass() == BEASTLORD || GetClass() == MONK) else if(GetClass() == DRUID || GetClass() == BEASTLORD || GetClass() == MONK)
softcap = RuleI(Combat, LeatherACSoftcap); softcap = (float)RuleI(Combat, LeatherACSoftcap);
else if(GetClass() == SHAMAN || GetClass() == ROGUE || else if(GetClass() == SHAMAN || GetClass() == ROGUE ||
GetClass() == BERSERKER || GetClass() == RANGER) GetClass() == BERSERKER || GetClass() == RANGER)
softcap = RuleI(Combat, ChainACSoftcap); softcap = (float)RuleI(Combat, ChainACSoftcap);
else else
softcap = RuleI(Combat, PlateACSoftcap); softcap = (float)RuleI(Combat, PlateACSoftcap);
} }
softcap += shield_ac; softcap += shield_ac;