Merge branch 'master' of https://github.com/mangos/mangos

Archives · Jun 13, 2011 · 2fc4dd6 · 2fc4dd6
2 parents 28b34f4 + ab0d7f5
commit 2fc4dd6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
@@ -96,7 +96,7 @@ class MANGOS_DLL_SPEC ObjectGuid
 
         operator uint64() const { return m_guid; }
     private:
-        ObjectGuid(uint32 const&);                          // no implementation, used for catch wrong type assign
+        explicit ObjectGuid(uint32 const&);                 // no implementation, used for catch wrong type assign
         ObjectGuid(HighGuid, uint32, uint64 counter);       // no implementation, used for catch wrong type assign
         ObjectGuid(HighGuid, uint64 counter);               // no implementation, used for catch wrong type assign
 

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
@@ -1136,6 +1136,11 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
+                case 17770:                                 // Wolfshead Helm Energy
+                {
+                    m_caster->CastSpell(m_caster, 29940, true, NULL);
+                    return;
+                }
                 case 17950:                                 // Shadow Portal
                 {
                     if (!unitTarget)

diff --git 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 "11627"
+ #define REVISION_NR "11629"
 #endif // __REVISION_NR_H__