From 394cf9264d6fe0ca3a58e83572954c3d3fbb9301 Mon Sep 17 00:00:00 2001 From: NetSky Date: Thu, 9 Jul 2009 11:09:00 +0400 Subject: [PATCH] [8153] Fixed some implicit float->int cast warnings. Signed-off-by: VladimirMangos --- src/game/Player.cpp | 5 +++-- src/game/Unit.cpp | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index f81ef2e17..29456e666 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6665,7 +6665,8 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl } // Add armor bonus from ArmorDamageModifier if > 0 if (proto->ArmorDamageModifier > 0) - armor+=proto->ArmorDamageModifier; + armor += uint32(proto->ArmorDamageModifier); + if (armor) HandleStatModifier(UNIT_MOD_ARMOR, BASE_VALUE, float(armor), apply); @@ -20462,4 +20463,4 @@ void Player::BuildTeleportAckMsg( WorldPacket *data, float x, float y, float z, bool Player::HasMovementFlag( MovementFlags f ) const { return m_movementInfo.HasMovementFlag(f); -} \ No newline at end of file +} diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f0ff6b6a1..aa389f823 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5408,7 +5408,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if (dummySpell->SpellFamilyFlags & UI64LIT(0x4000000000000)) { uint32 maxmana = GetMaxPower(POWER_MANA); - basepoints0 = maxmana* GetAttackTime(RANGED_ATTACK)/1000.0f/100.0f; + basepoints0 = int32(maxmana* GetAttackTime(RANGED_ATTACK)/1000.0f/100.0f); target = this; triggered_spell_id = 34075; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ef6f6f9d9..154b52387 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8152" + #define REVISION_NR "8153" #endif // __REVISION_NR_H__