mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Speedup check in Player::HasQuestForItem and Player::HasQuestForGO, related cleanups.

Browse source
This commit is contained in:
VladimirMangos 2009-02-16 19:02:55 +03:00
parent 58f2c540bf
commit e7fc5e390b
2 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/game/Player.cpp
View file

@ -5847,7 +5847,7 @@ bool Player::ModifyOneFactionReputation(FactionEntry const* factionEntry, int32
SetFactionVisible(&itr->second); SetFactionVisible(&itr->second);
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
if(uint32 questid = GetQuestSlotQuestId(i)) if(uint32 questid = GetQuestSlotQuestId(i))
{ {
@ -13381,7 +13381,7 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques
uint16 Player::FindQuestSlot( uint32 quest_id ) const uint16 Player::FindQuestSlot( uint32 quest_id ) const
{ {
for ( uint16 i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for ( uint16 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
if ( GetQuestSlotQuestId(i) == quest_id ) if ( GetQuestSlotQuestId(i) == quest_id )
return i; return i;
@ -13429,7 +13429,7 @@ void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject
void Player::ItemAddedQuestCheck( uint32 entry, uint32 count ) void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
{ {
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if ( questid == 0 ) if ( questid == 0 )
@ -13471,7 +13471,7 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count ) void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
{ {
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if(!questid) if(!questid)
@ -13514,7 +13514,7 @@ void Player::KilledMonster( uint32 entry, uint64 guid )
{ {
uint32 addkillcount = 1; uint32 addkillcount = 1;
GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, entry, addkillcount); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, entry, addkillcount);
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if(!questid) if(!questid)
@ -13569,7 +13569,7 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id )
bool isCreature = IS_CREATURE_GUID(guid); bool isCreature = IS_CREATURE_GUID(guid);
uint32 addCastCount = 1; uint32 addCastCount = 1;
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if(!questid) if(!questid)
@ -13636,7 +13636,7 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id )
void Player::TalkedToCreature( uint32 entry, uint64 guid ) void Player::TalkedToCreature( uint32 entry, uint64 guid )
{ {
uint32 addTalkCount = 1; uint32 addTalkCount = 1;
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if(!questid) if(!questid)
@ -13691,7 +13691,7 @@ void Player::TalkedToCreature( uint32 entry, uint64 guid )
void Player::MoneyChanged( uint32 count ) void Player::MoneyChanged( uint32 count )
{ {
for( int i = 0; i < MAX_QUEST_LOG_SIZE; i++ ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if (!questid) if (!questid)
@ -13721,13 +13721,21 @@ void Player::MoneyChanged( uint32 count )
bool Player::HasQuestForItem( uint32 itemid ) const bool Player::HasQuestForItem( uint32 itemid ) const
{ {
for( QuestStatusMap::const_iterator i = mQuestStatus.begin( ); i != mQuestStatus.end( ); ++i ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
QuestStatusData const& q_status = i->second; uint32 questid = GetQuestSlotQuestId(i);
if ( questid == 0 )
continue;
QuestStatusMap::const_iterator qs_itr = mQuestStatus.find(questid);
if(qs_itr == mQuestStatus.end())
continue;
QuestStatusData const& q_status = qs_itr->second;
if (q_status.m_status == QUEST_STATUS_INCOMPLETE) if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
{ {
Quest const* qinfo = objmgr.GetQuestTemplate(i->first); Quest const* qinfo = objmgr.GetQuestTemplate(questid);
if(!qinfo) if(!qinfo)
continue; continue;
@ -18535,14 +18543,23 @@ bool Player::IsSpellFitByClassAndRace( uint32 spell_id ) const
return false; return false;
} }
bool Player::HasQuestForGO(int32 GOId) bool Player::HasQuestForGO(int32 GOId) const
{ {
for( QuestStatusMap::iterator i = mQuestStatus.begin( ); i != mQuestStatus.end( ); ++i ) for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
{ {
QuestStatusData qs=i->second; uint32 questid = GetQuestSlotQuestId(i);
if ( questid == 0 )
continue;
QuestStatusMap::const_iterator qs_itr = mQuestStatus.find(questid);
if(qs_itr == mQuestStatus.end())
continue;
QuestStatusData const& qs = qs_itr->second;
if (qs.m_status == QUEST_STATUS_INCOMPLETE) if (qs.m_status == QUEST_STATUS_INCOMPLETE)
{ {
Quest const* qinfo = objmgr.GetQuestTemplate(i->first); Quest const* qinfo = objmgr.GetQuestTemplate(questid);
if(!qinfo) if(!qinfo)
continue; continue;

2
src/game/Player.h
View file

@ -1275,7 +1275,7 @@ class MANGOS_DLL_SPEC Player : public Unit
void TalkedToCreature( uint32 entry, uint64 guid ); void TalkedToCreature( uint32 entry, uint64 guid );
void MoneyChanged( uint32 value ); void MoneyChanged( uint32 value );
bool HasQuestForItem( uint32 itemid ) const; bool HasQuestForItem( uint32 itemid ) const;
bool HasQuestForGO(int32 GOId); bool HasQuestForGO(int32 GOId) const;
void UpdateForQuestsGO(); void UpdateForQuestsGO();
bool CanShareQuest(uint32 quest_id) const; bool CanShareQuest(uint32 quest_id) const;