Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2010-03-31 02:29:02 +04:00
commit f2572fdda0
33 changed files with 138 additions and 110 deletions

View file

@ -3659,7 +3659,11 @@ bool ChatHandler::HandleModifyStandStateCommand(const char* args)
return false;
uint32 anim_id = atoi((char*)args);
m_session->GetPlayer( )->SetUInt32Value( UNIT_NPC_EMOTESTATE , anim_id );
if (!sEmotesStore.LookupEntry(anim_id))
return false;
m_session->GetPlayer()->HandleEmoteState(anim_id);
return true;
}