Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp

5 files changed, 76 insertions, 76 deletions

diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 3cb0d4c7d3f..60523428e6f 100644
--- a/src/server/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
@@ -112,9 +112,9 @@ public:
         }
 
         if (allRanks)
-            targetPlayer->learnSpellHighRank(spell);
+            targetPlayer->LearnSpellHighestRank(spell);
         else
-            targetPlayer->learnSpell(spell, false);
+            targetPlayer->LearnSpell(spell, false);
 
         if (GetTalentSpellCost(spellInfo->GetFirstRankSpell()->Id))
             targetPlayer->SendTalentsInfoData(false);
@@ -133,7 +133,7 @@ public:
             if (!spellInfo->IsAbilityOfSkillType(SKILL_INTERNAL))
                 continue;
 
-            handler->GetSession()->GetPlayer()->learnSpell(i, false);
+            handler->GetSession()->GetPlayer()->LearnSpell(i, false);
         }
 
         handler->SendSysMessage(LANG_LEARNING_GM_SKILLS);
@@ -184,7 +184,7 @@ public:
             if (!SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false))
                 continue;
 
-            handler->GetSession()->GetPlayer()->learnSpell(spellInfo->Id, false);
+            handler->GetSession()->GetPlayer()->LearnSpell(spellInfo->Id, false);
         }
 
         handler->SendSysMessage(LANG_COMMAND_LEARN_CLASS_SPELLS);
@@ -228,7 +228,7 @@ public:
                 continue;
 
             // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree)
-            player->learnSpellHighRank(spellId);
+            player->LearnSpellHighestRank(spellId);
             player->AddTalent(spellId, player->GetActiveSpec(), true);
         }
 
@@ -320,7 +320,7 @@ public:
     {
         // skipping UNIVERSAL language (0)
         for (uint8 i = 1; i < LANGUAGES_COUNT; ++i)
-            handler->GetSession()->GetPlayer()->learnSpell(lang_description[i].spell_id, false);
+            handler->GetSession()->GetPlayer()->LearnSpell(lang_description[i].spell_id, false);
 
         handler->SendSysMessage(LANG_COMMAND_LEARN_ALL_LANG);
         return true;
@@ -334,7 +334,7 @@ public:
 
         target->LearnDefaultSkills();
         target->LearnCustomSpells();
-        target->learnQuestRewardedSpells();
+        target->LearnQuestRewardedSpells();
 
         handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST, handler->GetNameLink(target).c_str());
         return true;
@@ -451,7 +451,7 @@ public:
             if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, player, false))
                 continue;
 
-            player->learnSpell(skillLine->spellId, false);
+            player->LearnSpell(skillLine->spellId, false);
         }
     }
 
@@ -480,7 +480,7 @@ public:
             spellId = sSpellMgr->GetFirstSpellInChain(spellId);
 
         if (target->HasSpell(spellId))
-            target->removeSpell(spellId, false, !allRanks);
+            target->RemoveSpell(spellId, false, !allRanks);
         else
             handler->SendSysMessage(LANG_FORGET_SPELL);
 
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index e23a9d81787..de0fd21d139 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -162,7 +162,7 @@ public:
 
         if (target)
         {
-            target->resetSpells(/* bool myClassOnly */);
+            target->ResetSpells(/* bool myClassOnly */);
 
             ChatHandler(target->GetSession()).SendSysMessage(LANG_RESET_SPELLS);
             if (!handler->GetSession() || handler->GetSession()->GetPlayer() != target)
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index ebbe88f4a37..30e794579e8 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -2745,7 +2745,7 @@ class spell_gen_profession_research : public SpellScriptLoader
 
                 // learn random explicit discovery recipe (if any)
                 if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster))
-                    caster->learnSpell(discoveredSpellId, false);
+                    caster->LearnSpell(discoveredSpellId, false);
 
                 caster->UpdateCraftSkill(spellId);
             }
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index f8c68f99270..f2d206e50e6 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -1452,7 +1452,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader
 
                 // learn random explicit discovery recipe (if any)
                 if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster))
-                    caster->learnSpell(discoveredSpellId, false);
+                    caster->LearnSpell(discoveredSpellId, false);
             }
 
             void Register() override
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index 08bc408f114..17c37c7eba0 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -260,90 +260,90 @@ void ProfessionUnlearnSpells(Player* player, uint32 type)
     switch (type)
     {
         case S_UNLEARN_WEAPON:                              // S_UNLEARN_WEAPON
-            player->removeSpell(36125);                     // Light Earthforged Blade
-            player->removeSpell(36128);                     // Light Emberforged Hammer
-            player->removeSpell(36126);                     // Light Skyforged Axe
+            player->RemoveSpell(36125);                     // Light Earthforged Blade
+            player->RemoveSpell(36128);                     // Light Emberforged Hammer
+            player->RemoveSpell(36126);                     // Light Skyforged Axe
             break;
         case S_UNLEARN_ARMOR:                               // S_UNLEARN_ARMOR
-            player->removeSpell(36122);                     // Earthforged Leggings
-            player->removeSpell(36129);                     // Heavy Earthforged Breastplate
-            player->removeSpell(36130);                     // Stormforged Hauberk
-            player->removeSpell(34533);                     // Breastplate of Kings
-            player->removeSpell(34529);                     // Nether Chain Shirt
-            player->removeSpell(34534);                     // Bulwark of Kings
-            player->removeSpell(36257);                     // Bulwark of the Ancient Kings
-            player->removeSpell(36256);                     // Embrace of the Twisting Nether
-            player->removeSpell(34530);                     // Twisting Nether Chain Shirt
-            player->removeSpell(36124);                     // Windforged Leggings
+            player->RemoveSpell(36122);                     // Earthforged Leggings
+            player->RemoveSpell(36129);                     // Heavy Earthforged Breastplate
+            player->RemoveSpell(36130);                     // Stormforged Hauberk
+            player->RemoveSpell(34533);                     // Breastplate of Kings
+            player->RemoveSpell(34529);                     // Nether Chain Shirt
+            player->RemoveSpell(34534);                     // Bulwark of Kings
+            player->RemoveSpell(36257);                     // Bulwark of the Ancient Kings
+            player->RemoveSpell(36256);                     // Embrace of the Twisting Nether
+            player->RemoveSpell(34530);                     // Twisting Nether Chain Shirt
+            player->RemoveSpell(36124);                     // Windforged Leggings
             break;
         case S_UNLEARN_HAMMER:                              // S_UNLEARN_HAMMER
-            player->removeSpell(36262);                     // Dragonstrike
-            player->removeSpell(34546);                     // Dragonmaw
-            player->removeSpell(34545);                     // Drakefist Hammer
-            player->removeSpell(36136);                     // Lavaforged Warhammer
-            player->removeSpell(34547);                     // Thunder
-            player->removeSpell(34567);                     // Deep Thunder
-            player->removeSpell(36263);                     // Stormherald
-            player->removeSpell(36137);                     // Great Earthforged Hammer
+            player->RemoveSpell(36262);                     // Dragonstrike
+            player->RemoveSpell(34546);                     // Dragonmaw
+            player->RemoveSpell(34545);                     // Drakefist Hammer
+            player->RemoveSpell(36136);                     // Lavaforged Warhammer
+            player->RemoveSpell(34547);                     // Thunder
+            player->RemoveSpell(34567);                     // Deep Thunder
+            player->RemoveSpell(36263);                     // Stormherald
+            player->RemoveSpell(36137);                     // Great Earthforged Hammer
             break;
         case S_UNLEARN_AXE:                                 // S_UNLEARN_AXE
-            player->removeSpell(36260);                     // Wicked Edge of the Planes
-            player->removeSpell(34562);                     // Black Planar Edge
-            player->removeSpell(34541);                     // The Planar Edge
-            player->removeSpell(36134);                     // Stormforged Axe
-            player->removeSpell(36135);                     // Skyforged Great Axe
-            player->removeSpell(36261);                     // Bloodmoon
-            player->removeSpell(34543);                     // Lunar Crescent
-            player->removeSpell(34544);                     // Mooncleaver
+            player->RemoveSpell(36260);                     // Wicked Edge of the Planes
+            player->RemoveSpell(34562);                     // Black Planar Edge
+            player->RemoveSpell(34541);                     // The Planar Edge
+            player->RemoveSpell(36134);                     // Stormforged Axe
+            player->RemoveSpell(36135);                     // Skyforged Great Axe
+            player->RemoveSpell(36261);                     // Bloodmoon
+            player->RemoveSpell(34543);                     // Lunar Crescent
+            player->RemoveSpell(34544);                     // Mooncleaver
             break;
         case S_UNLEARN_SWORD:                               // S_UNLEARN_SWORD
-            player->removeSpell(36258);                     // Blazefury
-            player->removeSpell(34537);                     // Blazeguard
-            player->removeSpell(34535);                     // Fireguard
-            player->removeSpell(36131);                     // Windforged Rapier
-            player->removeSpell(36133);                     // Stoneforged Claymore
-            player->removeSpell(34538);                     // Lionheart Blade
-            player->removeSpell(34540);                     // Lionheart Champion
-            player->removeSpell(36259);                     // Lionheart Executioner
+            player->RemoveSpell(36258);                     // Blazefury
+            player->RemoveSpell(34537);                     // Blazeguard
+            player->RemoveSpell(34535);                     // Fireguard
+            player->RemoveSpell(36131);                     // Windforged Rapier
+            player->RemoveSpell(36133);                     // Stoneforged Claymore
+            player->RemoveSpell(34538);                     // Lionheart Blade
+            player->RemoveSpell(34540);                     // Lionheart Champion
+            player->RemoveSpell(36259);                     // Lionheart Executioner
             break;
         case S_UNLEARN_DRAGON:                              // S_UNLEARN_DRAGON
-            player->removeSpell(36076);                     // Dragonstrike Leggings
-            player->removeSpell(36079);                     // Golden Dragonstrike Breastplate
-            player->removeSpell(35576);                     // Ebon Netherscale Belt
-            player->removeSpell(35577);                     // Ebon Netherscale Bracers
-            player->removeSpell(35575);                     // Ebon Netherscale Breastplate
-            player->removeSpell(35582);                     // Netherstrike Belt
-            player->removeSpell(35584);                     // Netherstrike Bracers
-            player->removeSpell(35580);                     // Netherstrike Breastplate
+            player->RemoveSpell(36076);                     // Dragonstrike Leggings
+            player->RemoveSpell(36079);                     // Golden Dragonstrike Breastplate
+            player->RemoveSpell(35576);                     // Ebon Netherscale Belt
+            player->RemoveSpell(35577);                     // Ebon Netherscale Bracers
+            player->RemoveSpell(35575);                     // Ebon Netherscale Breastplate
+            player->RemoveSpell(35582);                     // Netherstrike Belt
+            player->RemoveSpell(35584);                     // Netherstrike Bracers
+            player->RemoveSpell(35580);                     // Netherstrike Breastplate
             break;
         case S_UNLEARN_ELEMENTAL:                           // S_UNLEARN_ELEMENTAL
-            player->removeSpell(36074);                     // Blackstorm Leggings
-            player->removeSpell(36077);                     // Primalstorm Breastplate
-            player->removeSpell(35590);                     // Primalstrike Belt
-            player->removeSpell(35591);                     // Primalstrike Bracers
-            player->removeSpell(35589);                     // Primalstrike Vest
+            player->RemoveSpell(36074);                     // Blackstorm Leggings
+            player->RemoveSpell(36077);                     // Primalstorm Breastplate
+            player->RemoveSpell(35590);                     // Primalstrike Belt
+            player->RemoveSpell(35591);                     // Primalstrike Bracers
+            player->RemoveSpell(35589);                     // Primalstrike Vest
             break;
         case S_UNLEARN_TRIBAL:                              // S_UNLEARN_TRIBAL
-            player->removeSpell(35585);                     // Windhawk Hauberk
-            player->removeSpell(35587);                     // Windhawk Belt
-            player->removeSpell(35588);                     // Windhawk Bracers
-            player->removeSpell(36075);                     // Wildfeather Leggings
-            player->removeSpell(36078);                     // Living Crystal Breastplate
+            player->RemoveSpell(35585);                     // Windhawk Hauberk
+            player->RemoveSpell(35587);                     // Windhawk Belt
+            player->RemoveSpell(35588);                     // Windhawk Bracers
+            player->RemoveSpell(36075);                     // Wildfeather Leggings
+            player->RemoveSpell(36078);                     // Living Crystal Breastplate
             break;
         case S_UNLEARN_SPELLFIRE:                           // S_UNLEARN_SPELLFIRE
-            player->removeSpell(26752);                     // Spellfire Belt
-            player->removeSpell(26753);                     // Spellfire Gloves
-            player->removeSpell(26754);                     // Spellfire Robe
+            player->RemoveSpell(26752);                     // Spellfire Belt
+            player->RemoveSpell(26753);                     // Spellfire Gloves
+            player->RemoveSpell(26754);                     // Spellfire Robe
             break;
         case S_UNLEARN_MOONCLOTH:                           // S_UNLEARN_MOONCLOTH
-            player->removeSpell(26760);                     // Primal Mooncloth Belt
-            player->removeSpell(26761);                     // Primal Mooncloth Shoulders
-            player->removeSpell(26762);                     // Primal Mooncloth Robe
+            player->RemoveSpell(26760);                     // Primal Mooncloth Belt
+            player->RemoveSpell(26761);                     // Primal Mooncloth Shoulders
+            player->RemoveSpell(26762);                     // Primal Mooncloth Robe
             break;
         case S_UNLEARN_SHADOWEAVE:                          // S_UNLEARN_SHADOWEAVE
-            player->removeSpell(26756);                     // Frozen Shadoweave Shoulders
-            player->removeSpell(26757);                     // Frozen Shadoweave Boots
-            player->removeSpell(26758);                     // Frozen Shadoweave Robe
+            player->RemoveSpell(26756);                     // Frozen Shadoweave Shoulders
+            player->RemoveSpell(26757);                     // Frozen Shadoweave Boots
+            player->RemoveSpell(26758);                     // Frozen Shadoweave Robe
             break;
     }
 }