Merge commit 'origin/master' into 330

This commit is contained in:
tomrus88 2009-10-07 16:37:07 +04:00
commit 90a80471f7
20 changed files with 142 additions and 124 deletions

View file

@ -39,6 +39,7 @@
#include "BattleGround.h"
#include "Pet.h"
#include "SocialMgr.h"
#include "DBCEnums.h"
void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
{
@ -1460,7 +1461,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode( WorldPacket & recv_data )
return;
}
if(RaidDifficulties(mode) == _player->GetRaidDifficulty())
if(Difficulty(mode) == _player->GetRaidDifficulty())
return;
// cannot reset while in an instance