diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index ae90293a..0b515fe2 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -333,10 +333,10 @@ void SoundEngine::updateMiniAudio() ///////////////////////////////////////////// // -// pickGameModeMusicID +// getGameModeMusicID // ///////////////////////////////////////////// -inline void SoundEngine::pickGameModeMusic(Minecraft* pMinecraft, unsigned int i) +inline void SoundEngine::getGameModeMusicID(Minecraft* pMinecraft, unsigned int i) { if (pMinecraft->localplayers[i] != nullptr && pMinecraft->localplayers[i]->abilities.instabuild && pMinecraft->localplayers[i]->abilities.mayfly) m_musicID = getMusicID(eMusicType_Creative); @@ -779,7 +779,7 @@ void SoundEngine::playStreaming(const wstring& name, float x, float y , float z, } else { - pickGameModeMusic(pMinecraft, i); + getGameModeMusicID(pMinecraft, i); } } else @@ -1388,7 +1388,7 @@ void SoundEngine::playMusicUpdate() else { // Set the end track - pickGameModeMusic(pMinecraft, i); + getGameModeMusicID(pMinecraft, i); SetIsPlayingEndMusic(false); SetIsPlayingNetherMusic(false); } @@ -1416,7 +1416,7 @@ void SoundEngine::playMusicUpdate() else { // set the Nether track - pickGameModeMusic(pMinecraft, i); + getGameModeMusicID(pMinecraft, i); SetIsPlayingNetherMusic(false); SetIsPlayingEndMusic(false); } @@ -1424,7 +1424,7 @@ void SoundEngine::playMusicUpdate() /* //This is setting the music in loop else if ( !playerInEnd && !playerInNether ) { - pickGameModeMusic(pMinecraft, i); + getGameModeMusicID(pMinecraft, i); } */ @@ -1517,7 +1517,7 @@ void SoundEngine::playMusicUpdate() } else { - pickGameModeMusic(pMinecraft, i); + getGameModeMusicID(pMinecraft, i); SetIsPlayingNetherMusic(false); SetIsPlayingEndMusic(false); diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h index a5160b58..2a9fb756 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.h +++ b/Minecraft.Client/Common/Audio/SoundEngine.h @@ -166,7 +166,7 @@ private: int GetRandomishTrack(int iStart,int iEnd); - inline void pickGameModeMusic(Minecraft* pMinecraft, unsigned int i); + inline void getGameModeMusicID(Minecraft* pMinecraft, unsigned int i); ma_engine m_engine; ma_engine_config m_engineConfig;