diff options
author | tartalo <none@none> | 2009-10-21 11:25:47 +0200 |
---|---|---|
committer | tartalo <none@none> | 2009-10-21 11:25:47 +0200 |
commit | 7a0bb775f04468259394204a38c1a09a597c33c4 (patch) | |
tree | 81367491ecf9774c9a9e428c7efd119f1aa6f536 | |
parent | db9408cc53a1a73ab1bdb0409be9c9dffce94452 (diff) |
* Disable m_pad in Player as it always uses initialization value, by Spp
--HG--
branch : trunk
-rw-r--r-- | src/game/Player.cpp | 8 | ||||
-rw-r--r-- | src/game/Player.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 2c98f9279b6..b2b87349cca 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -292,7 +292,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa m_ExtraFlags = 0; m_spellModTakingSpell = NULL; - m_pad = 0; + //m_pad = 0; // players always accept if(GetSession()->GetSecurity() == SEC_PLAYER) @@ -1137,10 +1137,10 @@ void Player::Update( uint32 p_time ) // If this is set during update SetSpellModTakingSpell call is missing somewhere in the code // Having this would prevent more aura charges to be dropped, so let's crash //assert (!m_spellModTakingSpell); - if(m_pad || m_spellModTakingSpell) + if(/*m_pad ||*/ m_spellModTakingSpell) { - sLog.outCrash("Player has m_pad %u during update!", m_pad); - if(m_spellModTakingSpell) + //sLog.outCrash("Player has m_pad %u during update!", m_pad); + //if(m_spellModTakingSpell) sLog.outCrash("Player has m_spellModTakingSpell %u during update!", m_spellModTakingSpell->m_spellInfo->Id); assert(false); m_spellModTakingSpell = NULL; diff --git a/src/game/Player.h b/src/game/Player.h index 6d94ae4ad83..68e564862be 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2361,7 +2361,7 @@ Spell * m_spellModTakingSpell; uint16 m_baseManaRegen; SpellModList m_spellMods[MAX_SPELLMOD]; - uint32 m_pad; + //uint32 m_pad; // Spell * m_spellModTakingSpell; // Spell for which charges are dropped in spell::finish EnchantDurationList m_enchantDuration; |