From ac9cced914fb4c9db0b2b64f7fd9f9ab8c7802ee Mon Sep 17 00:00:00 2001 From: megamage Date: Sat, 27 Dec 2008 15:17:15 -0600 Subject: *Update to Mangos 6957. --HG-- branch : trunk --- src/game/Player.cpp | 2 +- src/game/SpellMgr.cpp | 6 ++++-- src/shared/revision_nr.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 73d6ed1b899..8fbc26ed9eb 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -17016,7 +17016,7 @@ void Player::RemovePetitionsAndSigns(uint64 guid, uint32 type) CharacterDatabase.CommitTransaction(); } -void LeaveAllArenaTeams(uint64 guid) +void Player::LeaveAllArenaTeams(uint64 guid) { QueryResult *result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid='%u'", GUID_LOPART(guid)); if(!result) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 3a0f776352a..12689654310 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1794,8 +1794,10 @@ void SpellMgr::LoadSpellLearnSpells() if(!sSpellStore.LookupEntry(dbc_node.spell)) continue; - // talent or passive spells or skill-step spells auto-casted, other required explicit dependent learning - dbc_node.autoLearned = GetTalentSpellCost(spell) > 0 || IsPassiveSpell(spell) || IsSpellHaveEffect(entry,SPELL_EFFECT_SKILL_STEP); + // talent or passive spells or skill-step spells auto-casted and not need dependent learning, + // pet teaching spells don't must be dependent learning (casted) + // other required explicit dependent learning + dbc_node.autoLearned = entry->EffectImplicitTargetA[i]==TARGET_PET || GetTalentSpellCost(spell) > 0 || IsPassiveSpell(spell) || IsSpellHaveEffect(entry,SPELL_EFFECT_SKILL_STEP); SpellLearnSpellMap::const_iterator db_node_begin = GetBeginSpellLearnSpell(spell); SpellLearnSpellMap::const_iterator db_node_end = GetEndSpellLearnSpell(spell); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f90b03cc3a6..08976dc2423 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6955" + #define REVISION_NR "6957" #endif // __REVISION_NR_H__ -- cgit v1.2.3