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

Timestamp:

11/19/08 13:48:34 (17 years ago)

Author:

yumileroy

Message:

[svn] *** Source: MaNGOS ***
* Fixed build extractor at Windows Vista. Author: Vladimir
* Fixed comment text and code indentifiers spelling. Author: Vladimir & Paradox.
* Access cached member lists in guild handlers instead of querying the DB. Author: Hunuza
* Small fixes in send/received packet and simple code cleanup also. Author: Vladimir
* Not output error at loading empty character_ticket table. Author: Vladimir
* Not reset display model at shapeshift aura remove if it not set at apply. Author: Arthorius
* Applied props to few files.

Original author: visagalis
Date: 2008-11-14 16:28:45-06:00

Files:

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

trunk/src/game/SpellEffects.cpp

@@ -810 +810 @@
                 case 13567:                                 // Dummy Trigger
                 {
-                    // can be used for different aura triggreing, so select by aura
+                    // can be used for different aura triggering, so select by aura
                     if(!m_triggeredByAuraSpell || !unitTarget)
                         return;
@@ -1353 +1353 @@
                         case 25461: spellid = 25460; break; // Rank 7
                         default:
-                            sLog.outError("Spell::EffectDummy: Spell 28598 triggered by unhandeled spell %u",m_triggeredByAuraSpell->Id);
+                            sLog.outError("Spell::EffectDummy: Spell 28598 triggered by unhandled spell %u",m_triggeredByAuraSpell->Id);
                             return;
                     }
@@ -2666 +2666 @@
 
     // Some level depends spells
-    int multipler  = 0;
+    int multiplier  = 0;
     int level_diff = 0;
     switch (m_spellInfo->Id)
@@ -2673 +2673 @@
         case 9512:
             level_diff = m_caster->getLevel() - 40;
-            multipler  = 2;
+            multiplier  = 2;
             break;
         // Blood Fury
         case 24571:
             level_diff = m_caster->getLevel() - 60;
-            multipler  = 10;
+            multiplier  = 10;
             break;
         // Burst of Energy
         case 24532:
             level_diff = m_caster->getLevel() - 60;
-            multipler  = 4;
+            multiplier  = 4;
             break;
         default:
@@ -2690 +2690 @@
 
     if (level_diff > 0)
-        damage -= multipler * level_diff;
+        damage -= multiplier * level_diff;
 
     if(damage < 0)
@@ -3293 +3293 @@
         return;
 
-    // Fill possible dispell list
+    // Fill possible dispel list
     std::vector <Aura *> dispel_list;
 
@@ -3328 +3328 @@
         std::list < uint32 > fail_list;                     // spell_id
         int32 list_size = dispel_list.size();
-        // Dispell N = damage buffs (or while exist buffs for dispel)
+        // dispel N = damage buffs (or while exist buffs for dispel)
         for (int32 count=0; count < damage && list_size > 0; ++count)
         {
@@ -3352 +3352 @@
             for (std::vector<Aura *>::iterator j = dispel_list.begin(); j != dispel_list.end(); )
             {
-                Aura *dispeled = *j;
-                if (dispeled->GetId() == aur->GetId() && dispeled->GetCasterGUID() == aur->GetCasterGUID())
+                Aura *dispelled = *j;
+                if (dispelled->GetId() == aur->GetId() && dispelled->GetCasterGUID() == aur->GetCasterGUID())
                 {
                     j = dispel_list.erase(j);
@@ -3369 +3369 @@
             data.append(unitTarget->GetPackGUID());         // Victim GUID
             data.append(m_caster->GetPackGUID());           // Caster GUID
-            data << uint32(m_spellInfo->Id);                // Dispell spell id
+            data << uint32(m_spellInfo->Id);                // dispel spell id
             data << uint8(0);                               // not used
             data << uint32(count);                          // count
@@ -3376 +3376 @@
                 SpellEntry const* spellInfo = sSpellStore.LookupEntry(j->first);
                 data << uint32(spellInfo->Id);              // Spell Id
-                data << uint8(0);                           // 0 - dispeled !=0 cleansed
+                data << uint8(0);                           // 0 - dispelled !=0 cleansed
                 unitTarget->RemoveAurasDueToSpellByDispel(spellInfo->Id, j->second, m_caster);
             }
@@ -3409 +3409 @@
             data << uint64(m_caster->GetGUID());            // Caster GUID
             data << uint64(unitTarget->GetGUID());          // Victim GUID
-            data << uint32(m_spellInfo->Id);                // Dispell spell id
+            data << uint32(m_spellInfo->Id);                // dispel spell id
             for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j)
                 data << uint32(*j);                         // Spell Id
@@ -6225 +6225 @@
         std::list < std::pair<uint32,uint64> > success_list;
         int32 list_size = steal_list.size();
-        // Dispell N = damage buffs (or while exist buffs for dispel)
+        // dispel N = damage buffs (or while exist buffs for dispel)
         for (int32 count=0; count < damage && list_size > 0; ++count)
         {
@@ -6254 +6254 @@
             data.append(unitTarget->GetPackGUID());  // Victim GUID
             data.append(m_caster->GetPackGUID());    // Caster GUID
-            data << uint32(m_spellInfo->Id);         // Dispell spell id
+            data << uint32(m_spellInfo->Id);         // dispel spell id
             data << uint8(0);                        // not used
             data << uint32(count);                   // count