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

Core/Auras: Replaced false with NULL since we are dealing with pointers

Browse Source
This commit is contained in:
Shauren
2011-05-29 14:01:20 +02:00
parent 854438fb8a
commit 27246db7d5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+3 -3
View File
@@ -3143,7 +3143,7 @@ void Unit::DeMorph()
SetDisplayId(GetNativeDisplayId()); SetDisplayId(GetNativeDisplayId());
} }
Aura * Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const * newAura, uint8 effMask, int32 *baseAmount, Item * castItem, uint64 casterGUID) Aura* Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const* newAura, uint8 effMask, int32* baseAmount /*= NULL*/, Item* castItem /*= NULL*/, uint64 casterGUID /*= 0*/)
{ {
ASSERT(casterGUID); ASSERT(casterGUID);
// passive and Incanter's Absorption and auras with different type can stack with themselves any number of times // passive and Incanter's Absorption and auras with different type can stack with themselves any number of times
@@ -3161,7 +3161,7 @@ Aura * Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const * newAura, ui
// extremely rare case // extremely rare case
// let's just recreate aura // let's just recreate aura
if (effMask != foundAura->GetEffectMask()) if (effMask != foundAura->GetEffectMask())
return false; return NULL;
// update basepoints with new values - effect amount will be recalculated in ModStackAmount // update basepoints with new values - effect amount will be recalculated in ModStackAmount
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
@@ -3187,10 +3187,10 @@ Aura * Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const * newAura, ui
// try to increase stack amount // try to increase stack amount
foundAura->ModStackAmount(1); foundAura->ModStackAmount(1);
return foundAura; return foundAura;
} }
} }
return NULL; return NULL;
} }