*Fix build.
--HG-- branch : trunk
This commit is contained in:
+4
-2
@@ -275,7 +275,7 @@ std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi)
|
||||
|
||||
UpdateMask Player::updateVisualBits;
|
||||
|
||||
Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputationMgr(this) , m_spellModTakingSpell(NULL)
|
||||
Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputationMgr(this)
|
||||
{
|
||||
m_speakTime = 0;
|
||||
m_speakCount = 0;
|
||||
@@ -291,6 +291,8 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
|
||||
|
||||
m_ExtraFlags = 0;
|
||||
|
||||
m_spellModTakingSpell = NULL;
|
||||
|
||||
// players always accept
|
||||
if(GetSession()->GetSecurity() == SEC_PLAYER)
|
||||
SetAcceptWhispers(true);
|
||||
@@ -17036,7 +17038,7 @@ void Player::AddSpellMod(SpellModifier* mod, bool apply)
|
||||
}
|
||||
|
||||
// Restore spellmods in case of failed cast
|
||||
void Player::RestoreSpellMods(Spell const* spell)
|
||||
void Player::RestoreSpellMods(Spell * spell)
|
||||
{
|
||||
if (!spell || spell->m_appliedMods.empty())
|
||||
return;
|
||||
|
||||
+1
-1
@@ -104,7 +104,7 @@ struct SpellModifier
|
||||
int32 value;
|
||||
flag96 mask;
|
||||
uint32 spellId;
|
||||
Spell const* lastAffected;
|
||||
Aura *const ownerAura;
|
||||
};
|
||||
|
||||
typedef UNORDERED_MAP<uint32, PlayerSpell*> PlayerSpellMap;
|
||||
|
||||
@@ -672,7 +672,7 @@ void Aura::Update(uint32 diff)
|
||||
// used for example when triggered spell of spell:10 is modded
|
||||
Spell * modSpell = NULL;
|
||||
Unit* caster = NULL;
|
||||
if (IS_PLAYER_GUID(GetCasterGUID())
|
||||
if (IS_PLAYER_GUID(GetCasterGUID()))
|
||||
{
|
||||
caster = GetCaster();
|
||||
modSpell = ((Player*)caster)->FindCurrentSpellBySpellId(GetId());
|
||||
|
||||
Reference in New Issue
Block a user