diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-05 00:15:56 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-05 00:15:56 +0200 |
| commit | 70412e7e254a36398f101b4bfe1926c619063202 (patch) | |
| tree | 1a49d68aeaae5ca2869c37014a5d688ee37fda74 /src/server/game | |
| parent | e3acb2ecc76910155878116a92795480df7f8d73 (diff) | |
Core/Misc: MSVC warning fixes
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/AreaBoundary.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 145786c18a9..1326a60beda 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1658,7 +1658,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void SetTarget(ObjectGuid const& /*guid*/) override { } /// Used for serverside target changes, does not apply to players void SetSelection(ObjectGuid const& guid) { SetGuidValue(UNIT_FIELD_TARGET, guid); } - uint8 GetComboPoints() const { return GetPower(POWER_COMBO_POINTS); } + uint32 GetComboPoints() const { return uint32(GetPower(POWER_COMBO_POINTS)); } void AddComboPoints(int8 count, Spell* spell = nullptr); void GainSpellComboPoints(int8 count); void ClearComboPoints(); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 73e9b14a835..71c978760ba 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10946,7 +10946,7 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellInfo const* spellProto int32 Unit::CalcSpellDuration(SpellInfo const* spellProto) { - uint8 comboPoints = m_movedPlayer ? m_movedPlayer->GetComboPoints() : 0; + uint32 comboPoints = m_movedPlayer ? m_movedPlayer->GetComboPoints() : 0; int32 minduration = spellProto->GetDuration(); int32 maxduration = spellProto->GetMaxDuration(); diff --git a/src/server/game/Maps/AreaBoundary.h b/src/server/game/Maps/AreaBoundary.h index a8780ddb60f..0973d1a6e86 100644 --- a/src/server/game/Maps/AreaBoundary.h +++ b/src/server/game/Maps/AreaBoundary.h @@ -40,7 +40,7 @@ class TC_GAME_API AreaBoundary { double d_positionX, d_positionY, d_positionZ; DoublePosition(double x = 0.0, double y = 0.0, double z = 0.0, float o = 0.0f) - : Position(x, y, z, o), d_positionX(x), d_positionY(y), d_positionZ(z) { } + : Position(float(x), float(y), float(z), o), d_positionX(x), d_positionY(y), d_positionZ(z) { } DoublePosition(float x, float y = 0.0f, float z = 0.0f, float o = 0.0f) : Position(x, y, z, o), d_positionX(x), d_positionY(y), d_positionZ(z) { } DoublePosition(const Position& pos) diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 8bc77298ab7..b4f321574d7 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -557,7 +557,7 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster /*= nullptr*/, int32 const* { // bonus amount from combo points if (caster->m_movedPlayer && comboDamage) - if (uint8 comboPoints = caster->m_movedPlayer->GetComboPoints()) + if (uint32 comboPoints = caster->m_movedPlayer->GetComboPoints()) value += comboDamage * comboPoints; value = caster->ApplyEffectModifiers(_spellInfo, EffectIndex, value); |
