Changeset 57 for trunk/src/game/SpellEffects.cpp

Timestamp:

11/19/08 13:29:59 (17 years ago)

Author:

yumileroy

Message:

[svn] Update some Black Temple boss scripts.
Implement some Black Temple boss spells.
Update maiden of virtue and void reaver scripts. Patch provided by Blaymoira.

Original author: megamage
Date: 2008-10-18 16:25:58-05:00

Files:

• trunk/src/game/SpellEffects.cpp (modified) (5 diffs)

trunk/src/game/SpellEffects.cpp

@@ -4666 +4666 @@
         }
 
-        // Dreaming Glory
-        case 28698:
-        {
-            if(!unitTarget)
-                return;
-            unitTarget->CastSpell(unitTarget, 28694, true);
-            break;
-        }
-
         // Netherbloom
         case 28702:
@@ -4747 +4738 @@
                 }
             }
-            break;
-        }
-        case 41126:                                         // Flame Crash
-        {
-            if(!unitTarget)
-                return;
-
-           unitTarget->CastSpell(unitTarget, 41131, true);
-           break;
-        }
-        case 44876:                                         // Force Cast - Portal Effect: Sunwell Isle
-        {
-            if(!unitTarget)
-                return;
-
-            unitTarget->CastSpell(unitTarget, 44870, true);
             break;
         }
@@ -4791 +4766 @@
             break;
         }
+
+    }
+
+    if(!unitTarget || !unitTarget->isAlive()) // can we remove this check?
+    {
+        sLog.outError("Spell %u in EffectScriptEffect does not have unitTarget", m_spellInfo->Id);
+        return;
+    }
+
+    switch(m_spellInfo->Id)
+    {
+        // Dreaming Glory
+        case 28698: unitTarget->CastSpell(unitTarget, 28694, true); break;
+        // Needle Spine
+        case 39835: unitTarget->CastSpell(unitTarget, 39968, true); break;
+        // Draw Soul
+        case 40904: unitTarget->CastSpell(m_caster, 40903, true); break;
+        // Flame Crash
+        case 41126: unitTarget->CastSpell(unitTarget, 41131, true); break;
+        // Force Cast - Portal Effect: Sunwell Isle
+        case 44876: unitTarget->CastSpell(unitTarget, 44870, true); break;
         //5,000 Gold
         case 46642:
         {
-            if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-                return;
-
-            ((Player*)unitTarget)->ModifyMoney(50000000);
-
+            if(unitTarget->GetTypeId() == TYPEID_PLAYER)
+                ((Player*)unitTarget)->ModifyMoney(50000000);
             break;
         }
@@ -4810 +4803 @@
             case 0x800000:
             {
-                if(!unitTarget || !unitTarget->isAlive())
-                    return;
                 uint32 spellId2 = 0;
 
@@ -4862 +4853 @@
 
     // normal DB scripted effect
-    if(!unitTarget)
-        return;
-
     sLog.outDebug("Spell ScriptStart spellid %u in EffectScriptEffect ", m_spellInfo->Id);
     sWorld.ScriptsStart(sSpellScripts, m_spellInfo->Id, m_caster, unitTarget);