josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[7419] Fixed some type convertion warnings. Author: VladimirMangos

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-09 17:44:59 -06:00
parent 1131953fa1
commit 7b43f68ff7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+2 -2
View File
@@ -2970,7 +2970,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
else else
pet->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_24); pet->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_24);
((Player*)caster)->SetFarSightGUID(apply ? pet->GetGUID() : NULL); ((Player*)caster)->SetFarSightGUID(apply ? pet->GetGUID() : 0);
((Player*)caster)->SetCharm(apply ? pet : NULL); ((Player*)caster)->SetCharm(apply ? pet : NULL);
((Player*)caster)->SetClientControl(pet, apply ? 1 : 0); ((Player*)caster)->SetClientControl(pet, apply ? 1 : 0);
@@ -3935,7 +3935,7 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
{ {
// Explosive Shot // Explosive Shot
if (apply && !loading && caster) if (apply && !loading && caster)
m_modifier.m_amount +=caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 16 / 100; m_modifier.m_amount += int32(caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 16 / 100);
break; break;
} }
} }
src/game/SpellEffects.cpp
+1 -1
View File
@@ -1393,7 +1393,7 @@ void Spell::EffectDummy(uint32 i)
if (m_spellInfo->SpellFamilyFlags[0] & 0x40000) if (m_spellInfo->SpellFamilyFlags[0] & 0x40000)
{ {
// In 303 exist spirit depend // In 303 exist spirit depend
uint32 spirit = m_caster->GetStat(STAT_SPIRIT); uint32 spirit = uint32(m_caster->GetStat(STAT_SPIRIT));
switch (m_spellInfo->Id) switch (m_spellInfo->Id)
{ {
case 1454: damage+=spirit; break; case 1454: damage+=spirit; break;
src/game/Unit.cpp
+1 -1
View File
@@ -6705,7 +6705,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
//else if (auraSpellInfo->Id==47300) // Dark Flame Aura //else if (auraSpellInfo->Id==47300) // Dark Flame Aura
else if (auraSpellInfo->Id==57345) // Darkmoon Card: Greatness else if (auraSpellInfo->Id==57345) // Darkmoon Card: Greatness
{ {
uint32 stat = 0; float stat = 0.0f;
// strength // strength
if (GetStat(STAT_STRENGTH) > stat) { trigger_spell_id = 60229;stat = GetStat(STAT_STRENGTH); } if (GetStat(STAT_STRENGTH) > stat) { trigger_spell_id = 60229;stat = GetStat(STAT_STRENGTH); }
// agility // agility
src/shared/revision_nr.h
+1 -1
View File
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7418" #define REVISION_NR "7419"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__