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

Makes Auto-accepted quests show up the way they should. They should work perfectly again now.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Liberate
2010-07-28 13:47:32 +02:00
parent 78c3db174c
commit f5e3943e54
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -13918,7 +13918,7 @@ void Player::SendPreparedQuest(uint64 guid)
return; return;
} }
if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_AUTO_ACCEPT) && CanAddQuest(pQuest, true)) if (pQuest->IsAutoAccept() && CanAddQuest(pQuest, true))
{ {
AddQuest(pQuest, pObject); AddQuest(pQuest, pObject);
if (CanCompleteQuest(quest_id)) if (CanCompleteQuest(quest_id))
src/server/game/Quests/QuestDef.cpp
+2
View File
@@ -143,6 +143,8 @@ Quest::Quest(Field * questRecord)
QuestCompleteScript = questRecord[143].GetUInt32(); QuestCompleteScript = questRecord[143].GetUInt32();
QuestFlags |= SpecialFlags << 20; QuestFlags |= SpecialFlags << 20;
if (QuestFlags & QUEST_TRINITY_FLAGS_AUTO_ACCEPT)
QuestFlags |= QUEST_FLAGS_AUTO_ACCEPT;
m_reqitemscount = 0; m_reqitemscount = 0;
m_reqCreatureOrGOcount = 0; m_reqCreatureOrGOcount = 0;
src/server/game/Quests/QuestDef.h
+1 -1
View File
@@ -246,7 +246,7 @@ class Quest
bool IsDaily() const { return QuestFlags & QUEST_FLAGS_DAILY; } bool IsDaily() const { return QuestFlags & QUEST_FLAGS_DAILY; }
bool IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; } bool IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; }
bool IsDailyOrWeekly() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); } bool IsDailyOrWeekly() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
bool IsAutoAccept() const { return QuestFlags & QUEST_TRINITY_FLAGS_AUTO_ACCEPT; } bool IsAutoAccept() const { return QuestFlags & QUEST_FLAGS_AUTO_ACCEPT; }
bool IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; } bool IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; }
bool IsAllowedInRaid() const; bool IsAllowedInRaid() const;
src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
+1 -1
View File
@@ -246,7 +246,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket & recv_data)
Quest const* pQuest = objmgr.GetQuestTemplate(quest); Quest const* pQuest = objmgr.GetQuestTemplate(quest);
if (pQuest) if (pQuest)
{ {
if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_AUTO_ACCEPT) && _player->CanAddQuest(pQuest, true)) if (pQuest->IsAutoAccept() && _player->CanAddQuest(pQuest, true))
{ {
_player->AddQuest(pQuest, pObject); _player->AddQuest(pQuest, pObject);
if (_player->CanCompleteQuest(quest)) if (_player->CanCompleteQuest(quest))