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

[10140] Reuse GiveQuestSourceItem code for check case

Browse source 
Also show correct amount added item in case partly existed amount.
This commit is contained in:
VladimirMangos 2010-07-02 22:17:45 +04:00
parent 87946f9c76
commit 5724fa1d43
3 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/game/Player.cpp
View file

@ -13231,22 +13231,9 @@ bool Player::CanAddQuest( Quest const *pQuest, bool msg ) const
if (!SatisfyQuestLog( msg )) if (!SatisfyQuestLog( msg ))
return false; return false;
uint32 srcitem = pQuest->GetSrcItemId(); if (!CanGiveQuestSourceItem(pQuest))
if (srcitem > 0) return false;
{
uint32 count = pQuest->GetSrcItemCount();
ItemPosCountVec dest;
uint8 msg2 = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, srcitem, count );
// player already have max number (in most case 1) source item, no additional item needed and quest can be added.
if (msg2 == EQUIP_ERR_CANT_CARRY_MORE_OF_THIS)
return true;
else if (msg2 != EQUIP_ERR_OK)
{
SendEquipError(msg2, NULL, NULL, srcitem);
return false;
}
}
return true; return true;
} }
@ -13446,7 +13433,8 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
questStatusData.m_creatureOrGOcount[i] = 0; questStatusData.m_creatureOrGOcount[i] = 0;
} }
GiveQuestSourceItem( pQuest ); GiveQuestSourceItem(pQuest);
AdjustQuestReqItemCount( pQuest, questStatusData ); AdjustQuestReqItemCount( pQuest, questStatusData );
if( pQuest->GetRepObjectiveFaction() ) if( pQuest->GetRepObjectiveFaction() )
@ -14058,7 +14046,7 @@ bool Player::SatisfyQuestWeek( Quest const* qInfo, bool msg ) const
return m_weeklyquests.find(qInfo->GetQuestId()) == m_weeklyquests.end(); return m_weeklyquests.find(qInfo->GetQuestId()) == m_weeklyquests.end();
} }
bool Player::GiveQuestSourceItem( Quest const *pQuest ) bool Player::CanGiveQuestSourceItem( Quest const *pQuest, ItemPosCountVec* dest ) const
{ {
uint32 srcitem = pQuest->GetSrcItemId(); uint32 srcitem = pQuest->GetSrcItemId();
if (srcitem > 0) if (srcitem > 0)
@ -14067,14 +14055,17 @@ bool Player::GiveQuestSourceItem( Quest const *pQuest )
if( count <= 0 ) if( count <= 0 )
count = 1; count = 1;
ItemPosCountVec dest; uint8 msg;
uint8 msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, srcitem, count ); if (!dest)
if (msg == EQUIP_ERR_OK)
{ {
Item * item = StoreNewItem(dest, srcitem, true); ItemPosCountVec destTemp;
SendNewItem(item, count, true, false); msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, destTemp, srcitem, count );
return true;
} }
else
msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, *dest, srcitem, count );
if (msg == EQUIP_ERR_OK)
return true;
// player already have max amount required item, just report success // player already have max amount required item, just report success
else if (msg == EQUIP_ERR_CANT_CARRY_MORE_OF_THIS) else if (msg == EQUIP_ERR_CANT_CARRY_MORE_OF_THIS)
return true; return true;
@ -14086,6 +14077,22 @@ bool Player::GiveQuestSourceItem( Quest const *pQuest )
return true; return true;
} }
void Player::GiveQuestSourceItem( Quest const *pQuest )
{
ItemPosCountVec dest;
if (CanGiveQuestSourceItem(pQuest, &dest) && !dest.empty())
{
uint32 count = 0;
for(ItemPosCountVec::const_iterator c_itr = dest.begin(); c_itr != dest.end(); ++c_itr)
count += c_itr->count;
Item * item = StoreNewItem(dest, pQuest->GetSrcItemId(), true);
SendNewItem(item, count, true, false);
}
}
bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg ) bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg )
{ {
Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id); Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id);

3
src/game/Player.h
View file

@ -1405,7 +1405,8 @@ class MANGOS_DLL_SPEC Player : public Unit
bool SatisfyQuestPrevChain( Quest const* qInfo, bool msg ) const; bool SatisfyQuestPrevChain( Quest const* qInfo, bool msg ) const;
bool SatisfyQuestDay( Quest const* qInfo, bool msg ) const; bool SatisfyQuestDay( Quest const* qInfo, bool msg ) const;
bool SatisfyQuestWeek( Quest const* qInfo, bool msg ) const; bool SatisfyQuestWeek( Quest const* qInfo, bool msg ) const;
bool GiveQuestSourceItem( Quest const *pQuest ); bool CanGiveQuestSourceItem( Quest const *pQuest, ItemPosCountVec* dest = NULL) const;
void GiveQuestSourceItem( Quest const *pQuest );
bool TakeQuestSourceItem( uint32 quest_id, bool msg ); bool TakeQuestSourceItem( uint32 quest_id, bool msg );
bool GetQuestRewardStatus( uint32 quest_id ) const; bool GetQuestRewardStatus( uint32 quest_id ) const;
QuestStatus GetQuestStatus( uint32 quest_id ) const; QuestStatus GetQuestStatus( uint32 quest_id ) const;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10139" #define REVISION_NR "10140"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__