1
0

Merge remote-tracking branch 'origin/master' into foldermove2

Conflicts:
	GNUmakefile
This commit is contained in:
Alexander Harkness
2013-11-24 14:37:03 +00:00
131 changed files with 6157 additions and 3632 deletions

View File

@@ -466,6 +466,16 @@ void cProtocolRecognizer::SendRespawn(void)
void cProtocolRecognizer::SendExperience(void)
{
ASSERT(m_Protocol != NULL);
m_Protocol->SendExperience();
}
void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch)
{
ASSERT(m_Protocol != NULL);