Merge commit 'origin/master' into 310

Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Player.cpp
This commit is contained in:
tomrus88 2009-04-29 11:51:15 +04:00
commit d4323e0071
88 changed files with 681 additions and 685 deletions

View file

@ -1909,7 +1909,7 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/)
return true;
}
for (uint8 i = 0; i < strlen(args); i++)
for (uint8 i = 0; i < strlen(args); ++i)
{
if(!isalpha(args[i]) && args[i]!=' ')
{