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

@ -1574,6 +1574,22 @@ void ChatHandler::extractOptFirstArg(char* args, char** arg1, char** arg2)
*arg2 = p2;
}
char* ChatHandler::extractQuotedArg( char* args )
{
if(!*args)
return NULL;
if(*args=='"')
return strtok(args+1, "\"");
else
{
char* space = strtok(args, "\"");
if(!space)
return false;
return strtok(NULL, "\"");
}
}
bool ChatHandler::needReportToTarget(Player* chr) const
{
Player* pl = m_session->GetPlayer();