server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chest with quest loot deactivation (2622b33)

Browse Source 
commit 2622b33 on cabfever's repo
This commit is contained in:
Charles A Edwards 2016-02-08 13:39:02 +00:00
parent a9775fd4d2
commit 53184c9284
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/game/Object/Player.cpp
View File

@ -12926,16 +12926,22 @@ void Player::ItemAddedQuestCheck(uint32 entry, uint32 count)
{ {
uint32 questid = GetQuestSlotQuestId(i); uint32 questid = GetQuestSlotQuestId(i);
if (questid == 0) if (questid == 0)
{ continue; } {
continue;
}
QuestStatusData& q_status = mQuestStatus[questid]; QuestStatusData& q_status = mQuestStatus[questid];
if (q_status.m_status != QUEST_STATUS_INCOMPLETE) if (q_status.m_status != QUEST_STATUS_INCOMPLETE)
{ continue; } {
continue;
}
Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid); Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
if (!qInfo || !qInfo->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER)) if (!qInfo || !qInfo->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
{ continue; } {
continue;
}
for (int j = 0; j < QUEST_ITEM_OBJECTIVES_COUNT; ++j) for (int j = 0; j < QUEST_ITEM_OBJECTIVES_COUNT; ++j)
{ {
@ -12949,17 +12955,24 @@ void Player::ItemAddedQuestCheck(uint32 entry, uint32 count)
uint32 additemcount = (curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount); uint32 additemcount = (curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount);
q_status.m_itemcount[j] += additemcount; q_status.m_itemcount[j] += additemcount;
if (q_status.uState != QUEST_NEW) if (q_status.uState != QUEST_NEW)
{ q_status.uState = QUEST_CHANGED; } {
q_status.uState = QUEST_CHANGED;
}
SendQuestUpdateAddItem(qInfo, j, additemcount); SendQuestUpdateAddItem(qInfo, j, additemcount);
} }
if (CanCompleteQuest(questid)) if (CanCompleteQuest(questid))
{ CompleteQuest(questid); } {
CompleteQuest(questid); // UpdateForQuestWorldObjects() inside
return;
}
if (reqitemcount == q_status.m_itemcount[j]) // only 1 of several conditions is met
UpdateForQuestWorldObjects();
return; return;
} }
} }
} }
UpdateForQuestWorldObjects(); UpdateForQuestWorldObjects(); // TODO is it needed here?
} }
void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count) void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count)
@ -12994,9 +13007,9 @@ void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count)
q_status.m_itemcount[j] = curitemcount - remitemcount; q_status.m_itemcount[j] = curitemcount - remitemcount;
if (q_status.uState != QUEST_NEW) { q_status.uState = QUEST_CHANGED; } if (q_status.uState != QUEST_NEW) { q_status.uState = QUEST_CHANGED; }
IncompleteQuest(questid); IncompleteQuest(questid); // UpdateForQuestWorldObjects() inside
} }
return; return; // TODO what do we have here for the item required for 2 quests at once?
} }
} }
} }