Merge commit 'origin/master' into 310

This commit is contained in:
tomrus88 2009-05-25 21:57:59 +04:00
commit 2f15546120
15 changed files with 80 additions and 154 deletions

View file

@ -598,9 +598,6 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
result = result2;
}
if(questgiver->GetTypeId()==TYPEID_UNIT && ((Creature*)questgiver)->isCanTrainingAndResetTalentsOf(pPlayer) && result < DIALOG_STATUS_CHAT)
result = DIALOG_STATUS_CHAT;
return result;
}