Changeset 6 for trunk/src/game/Player.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/Player.cpp (modified) (20 diffs)

trunk/src/game/Player.cpp

@@ -357 +357 @@
     m_ArmorProficiency = 0;
     m_canParry = false;
+    m_canBlock = false;
     m_canDualWield = false;
     m_ammoDPS = 0.0f;
@@ -617 +618 @@
             ++action_itr[i];
     }
-
-    UpdateBlockPercentage();
 
     for (PlayerCreateInfoItems::const_iterator item_id_itr = info->item.begin(); item_id_itr!=info->item.end(); ++item_id_itr++)
@@ -2249 +2248 @@
         SetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1+i, 0.0f);
 
-    // Base parry percents
-    SetFloatValue(PLAYER_PARRY_PERCENTAGE, 5.0f);
-
-    //Base block percentage
-    SetFloatValue(PLAYER_BLOCK_PERCENTAGE, 5.0f);
-
+    SetFloatValue(PLAYER_PARRY_PERCENTAGE, 0.0f);
+    SetFloatValue(PLAYER_BLOCK_PERCENTAGE, 0.0f);
     SetUInt32Value(PLAYER_SHIELD_BLOCK, 0);
 
@@ -3287 +3282 @@
         updateVisualBits.SetBit(i);
 
-    for(uint16 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
-    {
-        updateVisualBits.SetBit((uint16)(PLAYER_FIELD_INV_SLOT_HEAD + i*2));
-        updateVisualBits.SetBit((uint16)(PLAYER_FIELD_INV_SLOT_HEAD + (i*2) + 1));
-    }
     //Players visible items are not inventory stuff
     //431) = 884 (0x374) = main weapon
@@ -3406 +3396 @@
 
     // known spell
-    if(HasSpell(trainer_spell->spell->Id))
+    if(HasSpell(trainer_spell->spell))
         return TRAINER_SPELL_GRAY;
 
     // check race/class requirement
-    if(!IsSpellFitByClassAndRace(trainer_spell->spell->Id))
+    if(!IsSpellFitByClassAndRace(trainer_spell->spell))
         return TRAINER_SPELL_RED;
 
     // check level requirement
-    if(getLevel() < ( trainer_spell->reqlevel ? trainer_spell->reqlevel : trainer_spell->spell->spellLevel))
+    if(getLevel() < trainer_spell->reqlevel)
         return TRAINER_SPELL_RED;
 
-    if(SpellChainNode const* spell_chain = spellmgr.GetSpellChainNode(trainer_spell->spell->Id))
+    if(SpellChainNode const* spell_chain = spellmgr.GetSpellChainNode(trainer_spell->spell))
     {
         // check prev.rank requirement
@@ -3432 +3422 @@
         return TRAINER_SPELL_RED;
 
+    // exist, already checked at loading
+    SpellEntry const* spell = sSpellStore.LookupEntry(trainer_spell->spell);
+
     // secondary prof. or not prof. spell
-    uint32 skill = trainer_spell->spell->EffectMiscValue[1];
-
-    if(trainer_spell->spell->Effect[1] != SPELL_EFFECT_SKILL || !IsPrimaryProfessionSkill(skill))
+    uint32 skill = spell->EffectMiscValue[1];
+
+    if(spell->Effect[1] != SPELL_EFFECT_SKILL || !IsPrimaryProfessionSkill(skill))
         return TRAINER_SPELL_GREEN;
 
     // check primary prof. limit
-    if(spellmgr.IsPrimaryProfessionFirstRankSpell(trainer_spell->spell->Id) && GetFreePrimaryProffesionPoints() == 0)
+    if(spellmgr.IsPrimaryProfessionFirstRankSpell(spell->Id) && GetFreePrimaryProffesionPoints() == 0)
         return TRAINER_SPELL_RED;
 
@@ -4877 +4870 @@
 
         if(pskill == SKILL_DEFENSE)
-        {
-            UpdateBlockPercentage();
-        }
+            UpdateDefenseBonusesMod();
     }
 }
@@ -5791 +5782 @@
         FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(Rep->repfaction1);
         uint32 current_reputation_rank1 = GetReputationRank(factionEntry1);
-        if(factionEntry1 && current_reputation_rank1 <= Rep->reputration_max_cap1)
+        if(factionEntry1 && current_reputation_rank1 <= Rep->reputation_max_cap1)
             ModifyFactionReputation(factionEntry1, donerep1);
 
@@ -5809 +5800 @@
         FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(Rep->repfaction2);
         uint32 current_reputation_rank2 = GetReputationRank(factionEntry2);
-        if(factionEntry2 && current_reputation_rank2 <= Rep->reputration_max_cap2)
+        if(factionEntry2 && current_reputation_rank2 <= Rep->reputation_max_cap2)
             ModifyFactionReputation(factionEntry2, donerep2);
 
@@ -11553 +11544 @@
     }
 
-    QuestMenu *qm = PlayerTalkClass->GetQuestMenu();
-    qm->ClearMenu();
+    QuestMenu &qm = PlayerTalkClass->GetQuestMenu();
+    qm.ClearMenu();
 
     for(QuestRelations::const_iterator i = pObjectQIR->lower_bound(pObject->GetEntry()); i != pObjectQIR->upper_bound(pObject->GetEntry()); ++i)
@@ -11561 +11552 @@
         QuestStatus status = GetQuestStatus( quest_id );
         if ( status == QUEST_STATUS_COMPLETE && !GetQuestRewardStatus( quest_id ) )
-            qm->AddMenuItem(quest_id, DIALOG_STATUS_REWARD_REP);
+            qm.AddMenuItem(quest_id, DIALOG_STATUS_REWARD_REP);
         else if ( status == QUEST_STATUS_INCOMPLETE )
-            qm->AddMenuItem(quest_id, DIALOG_STATUS_INCOMPLETE);
+            qm.AddMenuItem(quest_id, DIALOG_STATUS_INCOMPLETE);
         else if (status == QUEST_STATUS_AVAILABLE )
-            qm->AddMenuItem(quest_id, DIALOG_STATUS_CHAT);
+            qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT);
     }
 
@@ -11577 +11568 @@
 
         if (pQuest->IsAutoComplete() && CanTakeQuest(pQuest, false))
-            qm->AddMenuItem(quest_id, DIALOG_STATUS_REWARD_REP);
+            qm.AddMenuItem(quest_id, DIALOG_STATUS_REWARD_REP);
         else if ( status == QUEST_STATUS_NONE && CanTakeQuest( pQuest, false ) )
-            qm->AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE);
+            qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE);
     }
 }
@@ -11585 +11576 @@
 void Player::SendPreparedQuest( uint64 guid )
 {
-    QuestMenu* pQuestMenu = PlayerTalkClass->GetQuestMenu();
-    if( !pQuestMenu || pQuestMenu->MenuItemCount() < 1 )
+    QuestMenu& questMenu = PlayerTalkClass->GetQuestMenu();
+    if( questMenu.Empty() )
         return;
 
-    uint32 status = pQuestMenu->GetItem(0).m_qIcon;
-    if ( pQuestMenu->MenuItemCount() == 1 )
+    QuestMenuItem const& qmi0 = questMenu.GetItem( 0 );
+
+    uint32 status = qmi0.m_qIcon;
+
+    // single element case
+    if ( questMenu.MenuItemCount() == 1 )
     {
         // Auto open -- maybe also should verify there is no greeting
-        uint32 quest_id = pQuestMenu->GetItem(0).m_qId;
+        uint32 quest_id = qmi0.m_qId;
         Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
         if ( pQuest )
@@ -11608 +11603 @@
         }
     }
+    // multiply entries
     else
     {
@@ -13772 +13768 @@
                 break;
         }
-    }
-
-    //Unmount Player from previous mount, so speed bug with mount is no more...
-    if(IsMounted())
-    {
-        Unmount();
-        RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
     }
 
@@ -15627 +15616 @@
 void Player::BuildPlayerChat(WorldPacket *data, uint8 msgtype, std::string text, uint32 language) const
 {
-    bool pre = (msgtype==CHAT_MSG_EMOTE);
-
     *data << (uint8)msgtype;
     *data << (uint32)language;
@@ -15634 +15621 @@
     *data << (uint32)language;                               //language 2.1.0 ?
     *data << (uint64)GetGUID();
-    *data << (uint32)(text.length()+1+(pre?3:0));
-    if(pre)
-        data->append("%s ",3);
+    *data << (uint32)(text.length()+1);
     *data << text;
     *data << (uint8)chatTag();
@@ -17152 +17137 @@
     data << (float)0.01666667f;                             // game speed
     GetSession()->SendPacket( &data );
+
+    // set fly flag if in fly form or taxi flight to prevent visually drop at ground in showup moment
+    if(HasAuraType(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED) || isInFlight())
+        SetUnitMovementFlags(GetUnitMovementFlags() | MOVEMENTFLAG_FLYING2);
 }
 
@@ -17163 +17152 @@
     static const AuraType auratypes[] =
     {
-        SPELL_AURA_MOD_FEAR,     SPELL_AURA_TRANSFORM, SPELL_AURA_WATER_WALK,
-        SPELL_AURA_FEATHER_FALL, SPELL_AURA_HOVER,     SPELL_AURA_SAFE_FALL,
-        SPELL_AURA_FLY,          SPELL_AURA_NONE
+        SPELL_AURA_MOD_FEAR,     SPELL_AURA_TRANSFORM,                 SPELL_AURA_WATER_WALK,
+        SPELL_AURA_FEATHER_FALL, SPELL_AURA_HOVER,                     SPELL_AURA_SAFE_FALL,
+        SPELL_AURA_FLY,          SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED, SPELL_AURA_NONE
     };
     for(AuraType const* itr = &auratypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr)
@@ -18117 +18106 @@
 }
 
-bool ItemPosCount::isContainedIn(ItemPosCountVec &vec)
+void Player::SetCanParry( bool value )
+{
+    if(m_canParry==value)
+        return; 
+
+    m_canParry = value;
+    UpdateParryPercentage();
+}
+
+void Player::SetCanBlock( bool value )
+{
+    if(m_canBlock==value)
+        return; 
+
+    m_canBlock = value;
+    UpdateBlockPercentage();
+}
+
+bool ItemPosCount::isContainedIn(ItemPosCountVec const& vec) const
 {
     for(ItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end();++itr)
-    {
-        if(itr->pos == this->pos/* && itr->count == this.count*/)
-        {
+        if(itr->pos == this->pos)
             return true;
-        }
-    }
+
     return false;
 }
-