Merge commit 'origin/master' into 320

Conflicts:
	src/game/MovementHandler.cpp
	src/game/Player.cpp
This commit is contained in:
tomrus88 2009-08-09 20:18:41 +04:00
commit f07363e9e0
218 changed files with 708 additions and 860 deletions

View file

@ -692,7 +692,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
realCount += 1;
}
data.put<uint32>(0, realCount); // this will display warning about undelivered mail to player if realCount > mails_count
data.put<uint32>(0, realCount); // this will display warning about undelivered mail to player if realCount > mailsCount
data.put<uint8>(4, mailsCount); // set real send mails to client
SendPacket(&data);