[8087] Cleanup code. Author: NoFantasy

--HG--
branch : trunk
This commit is contained in:
megamage
2009-07-01 17:32:20 -05:00
parent 1102623072
commit 8521b39af6
+18 -22
View File
@@ -439,60 +439,56 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
{
CHECK_PACKET_SIZE(recvPacket,4);
uint32 quest;
recvPacket >> quest;
uint32 questId;
recvPacket >> questId;
sLog.outDebug( "WORLD: Received CMSG_PUSHQUESTTOPARTY quest = %u", quest );
sLog.outDebug("WORLD: Received CMSG_PUSHQUESTTOPARTY quest = %u", questId);
Quest const *pQuest = objmgr.GetQuestTemplate(quest);
if( pQuest )
if (Quest const *pQuest = objmgr.GetQuestTemplate(questId))
{
if( _player->GetGroup() )
{
Group *pGroup = _player->GetGroup();
if( pGroup )
if (Group* pGroup = _player->GetGroup())
{
for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player *pPlayer = itr->getSource();
if (!pPlayer || pPlayer == _player) // skip self
continue;
_player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_SHARING_QUEST);
if( !pPlayer->SatisfyQuestStatus( pQuest, false ) )
if (!pPlayer->SatisfyQuestStatus(pQuest, false))
{
_player->SendPushToPartyResponse( pPlayer, QUEST_PARTY_MSG_HAVE_QUEST );
_player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_HAVE_QUEST);
continue;
}
if( pPlayer->GetQuestStatus( quest ) == QUEST_STATUS_COMPLETE )
if (pPlayer->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE)
{
_player->SendPushToPartyResponse( pPlayer, QUEST_PARTY_MSG_FINISH_QUEST );
_player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_FINISH_QUEST);
continue;
}
if( !pPlayer->CanTakeQuest( pQuest, false ) )
if (!pPlayer->CanTakeQuest(pQuest, false))
{
_player->SendPushToPartyResponse( pPlayer, QUEST_PARTY_MSG_CANT_TAKE_QUEST );
_player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_CANT_TAKE_QUEST);
continue;
}
if( !pPlayer->SatisfyQuestLog( false ) )
if (!pPlayer->SatisfyQuestLog(false))
{
_player->SendPushToPartyResponse( pPlayer, QUEST_PARTY_MSG_LOG_FULL );
_player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_LOG_FULL);
continue;
}
if( pPlayer->GetDivider() != 0 )
if (pPlayer->GetDivider() != 0)
{
_player->SendPushToPartyResponse( pPlayer, QUEST_PARTY_MSG_BUSY );
_player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_BUSY);
continue;
}
pPlayer->PlayerTalkClass->SendQuestGiverQuestDetails( pQuest, _player->GetGUID(), true );
pPlayer->SetDivider( _player->GetGUID() );
}
pPlayer->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, _player->GetGUID(), true);
pPlayer->SetDivider(_player->GetGUID());
}
}
}