diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-07 03:34:23 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-07 03:34:23 +0100 |
commit | 407286fe810b66a2bfe37b09e07c97142e6cc169 (patch) | |
tree | 7e41da4dbdf0918cf7e3feace48e1556570d6e7a /src/server/scripts/Spells | |
parent | a2d533752c447a2bf4ef7b784e8abdbe3f6d6904 (diff) | |
parent | 21d43781acf1c60a66e4aa139324bff8d24d24d6 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/scripts/Spells')
-rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 27a6dac95f7..ed4148cd033 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -913,7 +913,7 @@ class spell_gen_profession_research : public SpellScriptLoader uint32 spellId = GetSpellInfo()->Id; // learn random explicit discovery recipe (if any) - if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster->ToPlayer())) + if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster)) 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 a88defad1ce..0508d95a60b 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -842,7 +842,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader uint32 spellId = GetSpellInfo()->Id; // learn random explicit discovery recipe (if any) - if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster->ToPlayer())) + if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster)) caster->learnSpell(discoveredSpellId, false); } |