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

Core/Cleanup:

Browse Source 
* move repeating code into separate method for storing locale strings in ObjectMgr (copy/paste sucks, you know)
* fix 'signed/unsigned' warnings (at least in VS)
* fix some other warnings and cleanup relative code

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-26 15:54:56 +06:00
parent 6036166716
commit 5fa14f58dc
23 changed files with 195 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuras.cpp
+5 -5
View File
@@ -603,7 +603,7 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
Update(diff, caster);
if (m_updateTargetMapInterval <= diff)
if (m_updateTargetMapInterval <= int32(diff))
UpdateTargetMap(caster);
else
m_updateTargetMapInterval -= diff;
@@ -631,7 +631,7 @@ void Aura::Update(uint32 diff, Unit * caster)
// handle manaPerSecond/manaPerSecondPerLevel
if (m_timeCla)
{
if (m_timeCla > diff)
if (m_timeCla > int32(diff))
m_timeCla -= diff;
else if (caster)
{
@@ -642,7 +642,7 @@ void Aura::Update(uint32 diff, Unit * caster)
Powers powertype = Powers(m_spellProto->powerType);
if (powertype == POWER_HEALTH)
{
if (caster->GetHealth() > manaPerSecond)
if (int32(caster->GetHealth()) > manaPerSecond)
caster->ModifyHealth(-manaPerSecond);
else
{
@@ -652,7 +652,7 @@ void Aura::Update(uint32 diff, Unit * caster)
}
else
{
if (caster->GetPower(powertype) >= manaPerSecond)
if (int32(caster->GetPower(powertype)) >= manaPerSecond)
caster->ModifyPower(powertype, -manaPerSecond);
else
{
@@ -730,7 +730,7 @@ bool Aura::ModStackAmount(int32 num)
// Modify stack but limit it
int32 stackAmount = m_stackAmount + num;
if (stackAmount > m_spellProto->StackAmount)
if (stackAmount > int32(m_spellProto->StackAmount))
stackAmount = m_spellProto->StackAmount;
else if (stackAmount <= 0) // Last aura from stack removed
{