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

Compile fix, not tested.

Browse source
This commit is contained in:
tomrus88 2010-03-31 05:58:01 +04:00
parent 97177cb517
commit 50bed7c7da
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/Player.cpp
View file

@ -12801,11 +12801,11 @@ void Player::PrepareQuestMenu( uint64 guid )
uint32 quest_id = i->second; uint32 quest_id = i->second;
QuestStatus status = GetQuestStatus( quest_id ); QuestStatus status = GetQuestStatus( quest_id );
if ( status == QUEST_STATUS_COMPLETE && !GetQuestRewardStatus( quest_id ) ) if ( status == QUEST_STATUS_COMPLETE && !GetQuestRewardStatus( quest_id ) )
qm.AddMenuItem(quest_id, DIALOG_STATUS_UNK2); qm.AddMenuItem(quest_id, DIALOG_STATUS_REWARD);
else if ( status == QUEST_STATUS_INCOMPLETE ) else if ( status == QUEST_STATUS_INCOMPLETE )
qm.AddMenuItem(quest_id, DIALOG_STATUS_UNK2); qm.AddMenuItem(quest_id, DIALOG_STATUS_INCOMPLETE);
else if (status == QUEST_STATUS_AVAILABLE ) else if (status == QUEST_STATUS_AVAILABLE )
qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT); qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE);
} }
for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i) for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i)
@ -12817,9 +12817,9 @@ void Player::PrepareQuestMenu( uint64 guid )
QuestStatus status = GetQuestStatus( quest_id ); QuestStatus status = GetQuestStatus( quest_id );
if (pQuest->IsAutoComplete() && CanTakeQuest(pQuest, false)) if (pQuest->IsAutoComplete() && CanTakeQuest(pQuest, false))
qm.AddMenuItem(quest_id, DIALOG_STATUS_UNK2); qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE_REP);
else if ( status == QUEST_STATUS_NONE && CanTakeQuest( pQuest, false ) ) else if ( status == QUEST_STATUS_NONE && CanTakeQuest( pQuest, false ) )
qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT); qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE);
} }
} }
@ -12843,9 +12843,9 @@ void Player::SendPreparedQuest(uint64 guid)
if (pQuest) if (pQuest)
{ {
if (status == DIALOG_STATUS_UNK2 && !GetQuestRewardStatus(quest_id)) if (status == DIALOG_STATUS_REWARD && !GetQuestRewardStatus(quest_id))
PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true); PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true);
else if (status == DIALOG_STATUS_UNK2) else if (status == DIALOG_STATUS_INCOMPLETE)
PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true); PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true);
// Send completable on repeatable and autoCompletable quest if player don't have quest // Send completable on repeatable and autoCompletable quest if player don't have quest
// TODO: verify if check for !pQuest->IsDaily() is really correct (possibly not) // TODO: verify if check for !pQuest->IsDaily() is really correct (possibly not)

2
src/game/QuestHandler.cpp
View file

@ -616,7 +616,7 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
result2 = DIALOG_STATUS_AVAILABLE; result2 = DIALOG_STATUS_AVAILABLE;
} }
else else
result2 = DIALOG_STATUS_CHAT; result2 = DIALOG_STATUS_LOW_LEVEL_AVAILABLE;
} }
else else
result2 = DIALOG_STATUS_UNAVAILABLE; result2 = DIALOG_STATUS_UNAVAILABLE;