josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Quests: Some cleanup in quest relation accessing

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-09-13 13:18:27 +02:00
parent c7289967b0
commit 6d0a031a77
6 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/Creature.cpp
+4 -4
View File
@@ -1315,8 +1315,8 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force)
bool Creature::hasQuest(uint32 quest_id) const bool Creature::hasQuest(uint32 quest_id) const
{ {
QuestRelations const& qr = sObjectMgr.mCreatureQuestRelations; QuestRelationBounds qr = sObjectMgr.GetCreatureQuestRelationBounds(GetEntry());
for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) for (QuestRelations::const_iterator itr = qr.first; itr != qr.second; ++itr)
{ {
if (itr->second == quest_id) if (itr->second == quest_id)
return true; return true;
@@ -1326,8 +1326,8 @@ bool Creature::hasQuest(uint32 quest_id) const
bool Creature::hasInvolvedQuest(uint32 quest_id) const bool Creature::hasInvolvedQuest(uint32 quest_id) const
{ {
QuestRelations const& qr = sObjectMgr.mCreatureQuestInvolvedRelations; QuestRelationBounds qir = sObjectMgr.GetCreatureQuestInvolvedRelationBounds(GetEntry());
for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) for (QuestRelations::const_iterator itr = qir.first; itr != qir.second; ++itr)
{ {
if (itr->second == quest_id) if (itr->second == quest_id)
return true; return true;
src/server/game/Entities/GameObject/GameObject.cpp
+4 -4
View File
@@ -742,8 +742,8 @@ GameObject* GameObject::GetGameObject(WorldObject& object, uint64 guid)
/*********************************************************/ /*********************************************************/
bool GameObject::hasQuest(uint32 quest_id) const bool GameObject::hasQuest(uint32 quest_id) const
{ {
QuestRelations const& qr = sObjectMgr.mGOQuestRelations; QuestRelationBounds qr = sObjectMgr.GetGOQuestRelationBounds(GetEntry());
for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) for (QuestRelations::const_iterator itr = qr.first; itr != qr.second; ++itr)
{ {
if (itr->second == quest_id) if (itr->second == quest_id)
return true; return true;
@@ -753,8 +753,8 @@ bool GameObject::hasQuest(uint32 quest_id) const
bool GameObject::hasInvolvedQuest(uint32 quest_id) const bool GameObject::hasInvolvedQuest(uint32 quest_id) const
{ {
QuestRelations const& qr = sObjectMgr.mGOQuestInvolvedRelations; QuestRelationBounds qir = sObjectMgr.GetGOQuestInvolvedRelationBounds(GetEntry());
for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) for (QuestRelations::const_iterator itr = qir.first; itr != qir.second; ++itr)
{ {
if (itr->second == quest_id) if (itr->second == quest_id)
return true; return true;
src/server/game/Entities/Player/Player.cpp
+12 -25
View File
@@ -13800,17 +13800,15 @@ uint32 Player::GetDefaultGossipMenuForSource(WorldObject *pSource)
void Player::PrepareQuestMenu(uint64 guid) void Player::PrepareQuestMenu(uint64 guid)
{ {
Object *pObject; QuestRelationBounds pObjectQR;
QuestRelations* pObjectQR; QuestRelationBounds pObjectQIR;
QuestRelations* pObjectQIR;
// pets also can have quests // pets also can have quests
Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid);
if (pCreature) if (pCreature)
{ {
pObject = (Object*)pCreature; pObjectQR = sObjectMgr.GetCreatureQuestRelationBounds(pCreature->GetEntry());
pObjectQR = &sObjectMgr.mCreatureQuestRelations; pObjectQIR = sObjectMgr.GetCreatureQuestInvolvedRelationBounds(pCreature->GetEntry());
pObjectQIR = &sObjectMgr.mCreatureQuestInvolvedRelations;
} }
else else
{ {
@@ -13821,9 +13819,8 @@ void Player::PrepareQuestMenu(uint64 guid)
GameObject *pGameObject = _map->GetGameObject(guid); GameObject *pGameObject = _map->GetGameObject(guid);
if (pGameObject) if (pGameObject)
{ {
pObject = (Object*)pGameObject; pObjectQR = sObjectMgr.GetGOQuestRelationBounds(pGameObject->GetEntry());
pObjectQR = &sObjectMgr.mGOQuestRelations; pObjectQIR = sObjectMgr.GetGOQuestInvolvedRelationBounds(pGameObject->GetEntry());
pObjectQIR = &sObjectMgr.mGOQuestInvolvedRelations;
} }
else else
return; return;
@@ -13832,7 +13829,7 @@ void Player::PrepareQuestMenu(uint64 guid)
QuestMenu &qm = PlayerTalkClass->GetQuestMenu(); QuestMenu &qm = PlayerTalkClass->GetQuestMenu();
qm.ClearMenu(); qm.ClearMenu();
for (QuestRelations::const_iterator i = pObjectQIR->lower_bound(pObject->GetEntry()); i != pObjectQIR->upper_bound(pObject->GetEntry()); ++i) for (QuestRelations::const_iterator i = pObjectQIR.first; i != pObjectQIR.second; ++i)
{ {
uint32 quest_id = i->second; uint32 quest_id = i->second;
QuestStatus status = GetQuestStatus(quest_id); QuestStatus status = GetQuestStatus(quest_id);
@@ -13844,7 +13841,7 @@ void Player::PrepareQuestMenu(uint64 guid)
// qm.AddMenuItem(quest_id, 2); // qm.AddMenuItem(quest_id, 2);
} }
for (QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i) for (QuestRelations::const_iterator i = pObjectQR.first; i != pObjectQR.second; ++i)
{ {
uint32 quest_id = i->second; uint32 quest_id = i->second;
Quest const* pQuest = sObjectMgr.GetQuestTemplate(quest_id); Quest const* pQuest = sObjectMgr.GetQuestTemplate(quest_id);
@@ -13964,17 +13961,11 @@ bool Player::IsActiveQuest(uint32 quest_id) const
Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest) Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest)
{ {
Object *pObject; QuestRelationBounds pObjectQR;
QuestRelations* pObjectQR;
QuestRelations* pObjectQIR;
Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid); Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid);
if (pCreature) if (pCreature)
{ pObjectQR = sObjectMgr.GetCreatureQuestRelationBounds(pCreature->GetEntry());
pObject = (Object*)pCreature;
pObjectQR = &sObjectMgr.mCreatureQuestRelations;
pObjectQIR = &sObjectMgr.mCreatureQuestInvolvedRelations;
}
else else
{ {
//we should obtain map pointer from GetMap() in 99% of cases. Special case //we should obtain map pointer from GetMap() in 99% of cases. Special case
@@ -13983,17 +13974,13 @@ Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest)
ASSERT(_map); ASSERT(_map);
GameObject *pGameObject = _map->GetGameObject(guid); GameObject *pGameObject = _map->GetGameObject(guid);
if (pGameObject) if (pGameObject)
{ pObjectQR = sObjectMgr.GetGOQuestRelationBounds(pGameObject->GetEntry());
pObject = (Object*)pGameObject;
pObjectQR = &sObjectMgr.mGOQuestRelations;
pObjectQIR = &sObjectMgr.mGOQuestInvolvedRelations;
}
else else
return NULL; return NULL;
} }
uint32 nextQuestID = pQuest->GetNextQuestInChain(); uint32 nextQuestID = pQuest->GetNextQuestInChain();
for (QuestRelations::const_iterator itr = pObjectQR->lower_bound(pObject->GetEntry()); itr != pObjectQR->upper_bound(pObject->GetEntry()); ++itr) for (QuestRelations::const_iterator itr = pObjectQR.first; itr != pObjectQR.second; ++itr)
{ {
if (itr->second == nextQuestID) if (itr->second == nextQuestID)
return sObjectMgr.GetQuestTemplate(nextQuestID); return sObjectMgr.GetQuestTemplate(nextQuestID);
src/server/game/Events/GameEventMgr.cpp
+14 -14
View File
@@ -1534,23 +1534,23 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate)
QuestRelList::iterator itr; QuestRelList::iterator itr;
for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr) for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr)
{ {
QuestRelations &CreatureQuestMap = sObjectMgr.mCreatureQuestRelations; QuestRelations* CreatureQuestMap = sObjectMgr.GetCreatureQuestRelationMap();
if (activate) // Add the pair(id,quest) to the multimap if (activate) // Add the pair(id,quest) to the multimap
CreatureQuestMap.insert(QuestRelations::value_type(itr->first, itr->second)); CreatureQuestMap->insert(QuestRelations::value_type(itr->first, itr->second));
else else
{ {
if (!hasCreatureQuestActiveEventExcept(itr->second,event_id)) if (!hasCreatureQuestActiveEventExcept(itr->second,event_id))
{ {
// Remove the pair(id,quest) from the multimap // Remove the pair(id,quest) from the multimap
QuestRelations::iterator qitr = CreatureQuestMap.find(itr->first); QuestRelations::iterator qitr = CreatureQuestMap->find(itr->first);
if (qitr == CreatureQuestMap.end()) if (qitr == CreatureQuestMap->end())
continue; continue;
QuestRelations::iterator lastElement = CreatureQuestMap.upper_bound(itr->first); QuestRelations::iterator lastElement = CreatureQuestMap->upper_bound(itr->first);
for (; qitr != lastElement; ++qitr) for (; qitr != lastElement; ++qitr)
{ {
if (qitr->second == itr->second) if (qitr->second == itr->second)
{ {
CreatureQuestMap.erase(qitr); // iterator is now no more valid CreatureQuestMap->erase(qitr); // iterator is now no more valid
break; // but we can exit loop since the element is found break; // but we can exit loop since the element is found
} }
} }
@@ -1559,23 +1559,23 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate)
} }
for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr) for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr)
{ {
QuestRelations &GameObjectQuestMap = sObjectMgr.mGOQuestRelations; QuestRelations* GameObjectQuestMap = sObjectMgr.GetGOQuestRelationMap();
if (activate) // Add the pair(id,quest) to the multimap if (activate) // Add the pair(id,quest) to the multimap
GameObjectQuestMap.insert(QuestRelations::value_type(itr->first, itr->second)); GameObjectQuestMap->insert(QuestRelations::value_type(itr->first, itr->second));
else else
{ {
if (!hasGameObjectQuestActiveEventExcept(itr->second,event_id)) if (!hasGameObjectQuestActiveEventExcept(itr->second,event_id))
{ {
// Remove the pair(id,quest) from the multimap // Remove the pair(id,quest) from the multimap
QuestRelations::iterator qitr = GameObjectQuestMap.find(itr->first); QuestRelations::iterator qitr = GameObjectQuestMap->find(itr->first);
if (qitr == GameObjectQuestMap.end()) if (qitr == GameObjectQuestMap->end())
continue; continue;
QuestRelations::iterator lastElement = GameObjectQuestMap.upper_bound(itr->first); QuestRelations::iterator lastElement = GameObjectQuestMap->upper_bound(itr->first);
for (; qitr != lastElement; ++qitr) for (; qitr != lastElement; ++qitr)
{ {
if (qitr->second == itr->second) if (qitr->second == itr->second)
{ {
GameObjectQuestMap.erase(qitr); // iterator is now no more valid GameObjectQuestMap->erase(qitr); // iterator is now no more valid
break; // but we can exit loop since the element is found break; // but we can exit loop since the element is found
} }
} }
src/server/game/Globals/ObjectMgr.h
+35 -4
View File
@@ -192,6 +192,7 @@ typedef UNORDERED_MAP<uint32,GossipMenuItemsLocale> GossipMenuItemsLocaleMap;
typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap; typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap;
typedef std::multimap<uint32,uint32> QuestRelations; typedef std::multimap<uint32,uint32> QuestRelations;
typedef std::pair<QuestRelations::const_iterator, QuestRelations::const_iterator> QuestRelationBounds;
typedef std::multimap<uint32,ItemRequiredTarget> ItemRequiredTargetMap; typedef std::multimap<uint32,ItemRequiredTarget> ItemRequiredTargetMap;
typedef std::pair<ItemRequiredTargetMap::const_iterator, ItemRequiredTargetMap::const_iterator> ItemRequiredTargetMapBounds; typedef std::pair<ItemRequiredTargetMap::const_iterator, ItemRequiredTargetMap::const_iterator> ItemRequiredTargetMapBounds;
@@ -612,10 +613,35 @@ class ObjectMgr
void LoadCreatureQuestRelations(); void LoadCreatureQuestRelations();
void LoadCreatureInvolvedRelations(); void LoadCreatureInvolvedRelations();
QuestRelations mGOQuestRelations; QuestRelations* GetGOQuestRelationMap()
QuestRelations mGOQuestInvolvedRelations; {
QuestRelations mCreatureQuestRelations; return &mGOQuestRelations;
QuestRelations mCreatureQuestInvolvedRelations; }
QuestRelationBounds GetGOQuestRelationBounds(uint32 go_entry)
{
return mGOQuestRelations.equal_range(go_entry);
}
QuestRelationBounds GetGOQuestInvolvedRelationBounds(uint32 go_entry)
{
return mGOQuestInvolvedRelations.equal_range(go_entry);
}
QuestRelations* GetCreatureQuestRelationMap()
{
return &mCreatureQuestRelations;
}
QuestRelationBounds GetCreatureQuestRelationBounds(uint32 creature_entry)
{
return mCreatureQuestRelations.equal_range(creature_entry);
}
QuestRelationBounds GetCreatureQuestInvolvedRelationBounds(uint32 creature_entry)
{
return mCreatureQuestInvolvedRelations.equal_range(creature_entry);
}
void LoadGameObjectScripts(); void LoadGameObjectScripts();
void LoadQuestEndScripts(); void LoadQuestEndScripts();
@@ -1026,6 +1052,11 @@ class ObjectMgr
QuestPOIMap mQuestPOIMap; QuestPOIMap mQuestPOIMap;
QuestRelations mGOQuestRelations;
QuestRelations mGOQuestInvolvedRelations;
QuestRelations mCreatureQuestRelations;
QuestRelations mCreatureQuestInvolvedRelations;
//character reserved names //character reserved names
typedef std::set<std::wstring> ReservedNamesMap; typedef std::set<std::wstring> ReservedNamesMap;
ReservedNamesMap m_ReservedNames; ReservedNamesMap m_ReservedNames;
src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
+8 -8
View File
@@ -572,21 +572,21 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
{ {
uint32 result = defstatus; uint32 result = defstatus;
QuestRelations const* qir; QuestRelationBounds qr;
QuestRelations const* qr; QuestRelationBounds qir;
switch(questgiver->GetTypeId()) switch(questgiver->GetTypeId())
{ {
case TYPEID_GAMEOBJECT: case TYPEID_GAMEOBJECT:
{ {
qir = &sObjectMgr.mGOQuestInvolvedRelations; qr = sObjectMgr.GetGOQuestRelationBounds(questgiver->GetEntry());
qr = &sObjectMgr.mGOQuestRelations; qir = sObjectMgr.GetGOQuestInvolvedRelationBounds(questgiver->GetEntry());
break; break;
} }
case TYPEID_UNIT: case TYPEID_UNIT:
{ {
qir = &sObjectMgr.mCreatureQuestInvolvedRelations; qr = sObjectMgr.GetCreatureQuestRelationBounds(questgiver->GetEntry());
qr = &sObjectMgr.mCreatureQuestRelations; qir = sObjectMgr.GetCreatureQuestInvolvedRelationBounds(questgiver->GetEntry());
break; break;
} }
default: default:
@@ -595,7 +595,7 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
return DIALOG_STATUS_NONE; return DIALOG_STATUS_NONE;
} }
for (QuestRelations::const_iterator i = qir->lower_bound(questgiver->GetEntry()); i != qir->upper_bound(questgiver->GetEntry()); ++i) for (QuestRelations::const_iterator i = qir.first; i != qir.second; ++i)
{ {
uint32 result2 = 0; uint32 result2 = 0;
uint32 quest_id = i->second; uint32 quest_id = i->second;
@@ -618,7 +618,7 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
result = result2; result = result2;
} }
for (QuestRelations::const_iterator i = qr->lower_bound(questgiver->GetEntry()); i != qr->upper_bound(questgiver->GetEntry()); ++i) for (QuestRelations::const_iterator i = qr.first; i != qr.second; ++i)
{ {
uint32 result2 = 0; uint32 result2 = 0;
uint32 quest_id = i->second; uint32 quest_id = i->second;