Changeset 229 for trunk/src/game/Unit.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/Unit.cpp (modified) (47 diffs)

trunk/src/game/Unit.cpp

@@ -388 +388 @@
     WorldPacket data( SMSG_MONSTER_MOVE, (GetPackGUID().size()+4+4+4+4+1+4+4+4+pathSize*4*3) );
     data.append(GetPackGUID());
-    data << GetPositionX( )
-        << GetPositionY( )
-        << GetPositionZ( );
-    data << GetOrientation( );
+    data << GetPositionX();
+    data << GetPositionY();
+    data << GetPositionZ();
+
+    // unknown field - unrelated to orientation
+    // seems to increment about 1000 for every 1.7 seconds
+    // for now, we'll just use mstime
+    data << getMSTime();
+
     data << uint8( 0 );
     data << uint32( MovementFlags );
@@ -869 +874 @@
             if(getVictim())
             {
-                // if have target and damage pVictim just call AI recation
+                // if have target and damage pVictim just call AI reaction
                 if(pVictim != getVictim() && pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI())
                     ((Creature*)pVictim)->AI()->AttackedBy(this);
@@ -983 +988 @@
 }
 
-void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster)
+void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
@@ -993 +998 @@
     }
 
-    CastSpell(Victim,spellInfo,triggered,castItem,triggredByAura, originalCaster);
-}
-
-void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster)
+    CastSpell(Victim,spellInfo,triggered,castItem,triggeredByAura, originalCaster);
+}
+
+void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster)
 {
     assert(Victim);
@@ -1008 +1013 @@
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
 
-    if(!originalCaster && triggredByAura)
-        originalCaster = triggredByAura->GetCasterGUID();
+    if(!originalCaster && triggeredByAura)
+        originalCaster = triggeredByAura->GetCasterGUID();
 
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
@@ -1017 +1022 @@
     targets.setDestination( Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ(), false);
     spell->m_CastItem = castItem;
-    spell->prepare(&targets, triggredByAura);
-}
-
-void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster)
+    spell->prepare(&targets, triggeredByAura);
+}
+
+void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
@@ -1030 +1035 @@
     }
 
-    CastCustomSpell(Victim,spellInfo,bp0,bp1,bp2,triggered,castItem,triggredByAura, originalCaster);
-}
-
-void Unit::CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster)
+    CastCustomSpell(Victim,spellInfo,bp0,bp1,bp2,triggered,castItem,triggeredByAura, originalCaster);
+}
+
+void Unit::CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster)
 {
     if(!spellInfo)
@@ -1044 +1049 @@
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
 
-    if(!originalCaster && triggredByAura)
-        originalCaster = triggredByAura->GetCasterGUID();
+    if(!originalCaster && triggeredByAura)
+        originalCaster = triggeredByAura->GetCasterGUID();
 
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster);
@@ -1061 +1066 @@
     targets.setUnitTarget( Victim );
     spell->m_CastItem = castItem;
-    spell->prepare(&targets, triggredByAura);
+    spell->prepare(&targets, triggeredByAura);
 }
 
 // used for scripting
-void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster)
+void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
@@ -1075 +1080 @@
     }
 
-    CastSpell(x, y, z,spellInfo,triggered,castItem,triggredByAura, originalCaster);
+    CastSpell(x, y, z,spellInfo,triggered,castItem,triggeredByAura, originalCaster);
 }
 
 // used for scripting
-void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster)
+void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster)
 {
     if(!spellInfo)
@@ -1090 +1095 @@
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
 
-    if(!originalCaster && triggredByAura)
-        originalCaster = triggredByAura->GetCasterGUID();
+    if(!originalCaster && triggeredByAura)
+        originalCaster = triggeredByAura->GetCasterGUID();
 
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
@@ -1098 +1103 @@
     targets.setDestination(x, y, z);
     spell->m_CastItem = castItem;
-    spell->prepare(&targets, triggredByAura);
+    spell->prepare(&targets, triggeredByAura);
 }
 
@@ -1106 +1111 @@
     DEBUG_LOG("DealFlatDamage (BEFORE) >> DMG:%u", *damage);
 
-    // Per-damage calss calculation
+    // Per-damage class calculation
     switch (spellInfo->DmgClass)
     {
@@ -1712 +1717 @@
     }
 
-    // only split damage if not damaing yourself
+    // only split damage if not damaging yourself
     if(pVictim != this)
     {
@@ -2192 +2197 @@
         hitInfo = HITINFO_LEFTSWING;
     else
-        return;                                             // ignore ranaged case
+        return;                                             // ignore ranged case
 
     uint32 extraAttacks = m_extraAttacks;
@@ -2306 +2311 @@
     else
     {
-        // parry can be avoided only by some abilites
+        // parry can be avoided only by some abilities
         parry_chance = pVictim->GetUnitParryChance();
         // block might be bypassed by it as well
@@ -2320 +2325 @@
         crit_chance += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, spellInfo->SchoolMask);
 
-        if( dodge_chance != 0.0f )                          // if dodge chance is already 0, ignore talents fpr speed
+        if( dodge_chance != 0.0f )                          // if dodge chance is already 0, ignore talents for speed
         {
             AuraList const& mCanNotBeDodge = GetAurasByType(SPELL_AURA_IGNORE_COMBAT_RESULT);
@@ -2886 +2891 @@
 
     // TODO need use this code for spell hit result calculation
-    // now code commented for compotability
+    // now code commented for computability
     switch (spell->DmgClass)
     {
@@ -3058 +3063 @@
                 return GetFloatValue(PLAYER_BLOCK_PERCENTAGE);
         }
-        // is player but has no block ability or no not broken shield equiped
+        // is player but has no block ability or no not broken shield equipped
         return 0.0f;
     }
@@ -3139 +3144 @@
             return GetMaxSkillValueForLevel();              // always maximized SKILL_FERAL_COMBAT in fact
 
-        // weaon skill or (unarmed for base attack)
+        // weapon skill or (unarmed for base attack)
         uint32  skill = item ? item->GetSkill() : SKILL_UNARMED;
 
@@ -3457 +3462 @@
 }
 
-bool Unit::isInAccessablePlaceFor(Creature const* c) const
+bool Unit::isInAccessiblePlaceFor(Creature const* c) const
 {
     if(IsInWater())
@@ -3493 +3498 @@
 float Unit::GetTotalAuraMultiplier(AuraType auratype) const
 {
-    float multipler = 1.0f;
+    float multiplier = 1.0f;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
-        multipler *= (100.0f + (*i)->GetModifier()->m_amount)/100.0f;
-
-    return multipler;
+        multiplier *= (100.0f + (*i)->GetModifier()->m_amount)/100.0f;
+
+    return multiplier;
 }
 
@@ -3542 +3547 @@
 float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const
 {
-    float multipler = 1.0f;
+    float multiplier = 1.0f;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
@@ -3549 +3554 @@
         Modifier* mod = (*i)->GetModifier();
         if (mod->m_miscvalue & misc_mask)
-            multipler *= (100.0f + mod->m_amount)/100.0f;
-    }
-    return multipler;
+            multiplier *= (100.0f + mod->m_amount)/100.0f;
+    }
+    return multiplier;
 }
 
@@ -3600 +3605 @@
 float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const
 {
-    float multipler = 1.0f;
+    float multiplier = 1.0f;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
@@ -3607 +3612 @@
         Modifier* mod = (*i)->GetModifier();
         if (mod->m_miscvalue == misc_value)
-            multipler *= (100.0f + mod->m_amount)/100.0f;
-    }
-    return multipler;
+            multiplier *= (100.0f + mod->m_amount)/100.0f;
+    }
+    return multiplier;
 }
 
@@ -3725 +3730 @@
         {
             delete Aur;
-            return false;                                   // couldnt remove conflicting aura with higher rank
+            return false;                                   // couldn't remove conflicting aura with higher rank
         }
     }
@@ -3867 +3872 @@
         {
             // prevent remove dummy triggered spells at next effect aura add
-            switch(spellProto->Effect[j])                   // main spell auras added added after triggred spell
+            switch(spellProto->Effect[j])                   // main spell auras added added after triggered spell
             {
                 case SPELL_EFFECT_DUMMY:
@@ -3880 +3885 @@
                 break;
 
-            // prevent remove form main spell by triggred passive spells
+            // prevent remove form main spell by triggered passive spells
             switch(i_spellProto->EffectApplyAuraName[j])    // main aura added before triggered spell
             {
@@ -4049 +4054 @@
     // Create dispel mask by dispel type
     uint32 dispelMask = GetDispellMask(type);
-    // Dispel all existing auras vs current dispell type
+    // Dispel all existing auras vs current dispel type
     AuraMap& auras = GetAuras();
     for(AuraMap::iterator itr = auras.begin(); itr != auras.end(); )
@@ -4482 +4487 @@
 
     // Assign melee/ranged proc flags for magic attacks, that are actually melee/ranged abilities
-    // not assign for spell proc triggered spell to prevent infinity (or unexpacted 2-3 times) melee damage spell proc call with melee damage effect
+    // not assign for spell proc triggered spell to prevent infinity (or unexpected 2-3 times) melee damage spell proc call with melee damage effect
     // That is the question though if it's fully correct
     if(procSpell && !isTriggeredSpell)
@@ -4509 +4514 @@
     if (procAttacker)
     {
-        // procces auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
+        // processing auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
         ProcDamageAndSpellFor(false,pVictim,procAttacker,attackerProcEffectAuraTypes,attType, procSpell, damage, damageSchoolMask);
         ProcDamageAndSpellFor(false,pVictim,procAttacker,attackerProcCastAuraTypes,attType, procSpell, damage, damageSchoolMask);
@@ -4518 +4523 @@
     if(pVictim && pVictim->isAlive() && procVictim)
     {
-        // procces auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
+        // processing auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
         pVictim->ProcDamageAndSpellFor(true,this,procVictim,victimProcEffectAuraTypes,attType,procSpell, damage, damageSchoolMask);
         pVictim->ProcDamageAndSpellFor(true,this,procVictim,victimProcCastAuraTypes,attType,procSpell, damage, damageSchoolMask);
@@ -4707 +4712 @@
                 case 35429:
                 {
-                    // prevent chain of triggred spell from same triggred spell
+                    // prevent chain of triggered spell from same triggered spell
                     if(procSpell && procSpell->Id==26654)
                         return false;
@@ -5729 +5734 @@
 
                 uint32 spellId = 0;
-                // Every Lightning Bolt and Chain Lightning spell have dublicate vs half damage and zero cost
+                // Every Lightning Bolt and Chain Lightning spell have duplicate vs half damage and zero cost
                 switch (procSpell->Id)
                 {
@@ -5772 +5777 @@
                     ((Player*)this)->RemoveSpellCooldown(spellId);
 
-                // Hmmm.. in most case spells alredy set half basepoints but...
+                // Hmmm.. in most case spells already set half basepoints but...
                 // Lightning Bolt (2-10 rank) have full basepoint and half bonus from level
                 // As on wiki:
@@ -5990 +5995 @@
                     return false;
 
-                // custom chnace
+                // custom chance
                 float chance = 0;
                 switch (triggeredByAura->GetId())
@@ -7054 +7059 @@
         if(!(*iter)->AttackStop())
         {
-            sLog.outError("WORLD: Unit has an attacker that isnt attacking it!");
+            sLog.outError("WORLD: Unit has an attacker that isn't attacking it!");
             m_attackers.erase(iter);
         }
@@ -8375 +8380 @@
 {
     // normalized proc chance for weapon attack speed
-    // (odd formulae...)
+    // (odd formula...)
     if(isAttackReady(BASE_ATTACK))
         return (GetAttackTime(BASE_ATTACK) * 1.8f / 1000.0f);
@@ -9064 +9069 @@
     Unit* target = NULL;
 
-    //This function only useful once AI has been initilazied
+    //This function only useful once AI has been initialized
     if (!((Creature*)this)->AI())
         return false;
@@ -9096 +9101 @@
         for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr)
         {
-            if( (*itr)->IsInMap(this) && canAttack(*itr) && (*itr)->isInAccessablePlaceFor((Creature*)this) )
+            if( (*itr)->IsInMap(this) && canAttack(*itr) && (*itr)->isInAccessiblePlaceFor((Creature*)this) )
                 return false;
         }
@@ -9338 +9343 @@
     if(unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
     {
-        sLog.outError("ERROR in HandleStatModifier(): nonexisted UnitMods or wrong UnitModifierType!");
+        sLog.outError("ERROR in HandleStatModifier(): non existed UnitMods or wrong UnitModifierType!");
         return false;
     }
@@ -9408 +9413 @@
     if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
     {
-        sLog.outError("ERROR: trial to access nonexisted modifier value from UnitMods!");
+        sLog.outError("ERROR: trial to access non existed modifier value from UnitMods!");
         return 0.0f;
     }
@@ -9438 +9443 @@
     if(unitMod >= UNIT_MOD_END)
     {
-        sLog.outError("ERROR: trial to access nonexisted UnitMods in GetTotalAuraModValue()!");
+        sLog.outError("ERROR: trial to access non existed UnitMods in GetTotalAuraModValue()!");
         return 0.0f;
     }
@@ -9738 +9743 @@
     {
         InterruptNonMeleeSpells(true);
-        m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted ans will deleated at call in Map::RemoveAllObjectsInRemoveList
+        m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
         CombatStop();
         ClearComboPointHolders();
@@ -10048 +10053 @@
                 {
                     sLog.outError("Spell aura %u (id:%u effect:%u) has been deleted before call spell proc event handler",*aur,i->triggeredByAura_SpellPair.first,i->triggeredByAura_SpellPair.second);
-                    sLog.outError("It can be deleted one from early proccesed auras:");
+                    sLog.outError("It can be deleted one from early processed auras:");
                     for(ProcTriggeredList::iterator i2 = procTriggered.begin(); i != i2; ++i2)
                         sLog.outError("     Spell aura %u (id:%u effect:%u)",*aur,i2->triggeredByAura_SpellPair.first,i2->triggeredByAura_SpellPair.second);
@@ -10298 +10303 @@
 
     // send explicit stop packet
-    // rely on vmaps here because for exemple stormwind is in air
+    // rely on vmaps here because for example stormwind is in air
     float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
     //if (fabs(GetPositionZ() - z) < 2.0f)