mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-06-23 12:37:02 +00:00
Fixed DLC audio.
This commit is contained in:
parent
a3ac98884e
commit
73a89b80e1
|
|
@ -1109,14 +1109,12 @@ void SoundEngine::playMusicUpdate()
|
|||
|
||||
SetIsPlayingStreamingGameMusic(true);
|
||||
SetIsPlayingStreamingCDMusic(false);
|
||||
m_MusicType=eMusicType_Game;
|
||||
m_StreamingAudioInfo.bIs3D=false;
|
||||
}
|
||||
else if(m_musicID<m_iStream_CD_1)
|
||||
{
|
||||
SetIsPlayingStreamingGameMusic(true);
|
||||
SetIsPlayingStreamingCDMusic(false);
|
||||
m_MusicType=eMusicType_Game;
|
||||
m_StreamingAudioInfo.bIs3D=false;
|
||||
// build the name
|
||||
strcat((char *)m_szStreamName,"music/");
|
||||
|
|
@ -1128,7 +1126,6 @@ void SoundEngine::playMusicUpdate()
|
|||
{
|
||||
SetIsPlayingStreamingGameMusic(false);
|
||||
SetIsPlayingStreamingCDMusic(true);
|
||||
m_MusicType=eMusicType_CD;
|
||||
m_StreamingAudioInfo.bIs3D=true;
|
||||
// build the name
|
||||
strcat((char *)m_szStreamName,"cds/");
|
||||
|
|
@ -1444,7 +1441,8 @@ void SoundEngine::playMusicUpdate()
|
|||
bool playerInEnd=false;
|
||||
bool playerInNether=false;
|
||||
|
||||
for(unsigned int i=0;i<MAX_LOCAL_PLAYERS;i++)
|
||||
unsigned int i=0;
|
||||
for(i=0;i<MAX_LOCAL_PLAYERS;i++)
|
||||
{
|
||||
if(pMinecraft->localplayers[i]!=nullptr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ enum eMusicFiles
|
|||
eStream_Overworld_hal4,
|
||||
eStream_Overworld_nuance1,
|
||||
eStream_Overworld_nuance2,
|
||||
#ifndef _XBOX
|
||||
// Add the new music tracks
|
||||
eStream_Overworld_Creative1,
|
||||
eStream_Overworld_Creative2,
|
||||
|
|
@ -35,7 +34,6 @@ enum eMusicFiles
|
|||
eStream_Overworld_Menu2,
|
||||
eStream_Overworld_Menu3,
|
||||
eStream_Overworld_Menu4,
|
||||
#endif
|
||||
eStream_Overworld_piano1,
|
||||
eStream_Overworld_piano2,
|
||||
eStream_Overworld_piano3, // <-- make piano3 the last overworld one
|
||||
|
|
@ -160,6 +158,8 @@ private:
|
|||
#endif
|
||||
|
||||
int GetRandomishTrack(int iStart,int iEnd);
|
||||
void updateMiniAudio();
|
||||
inline void getGameModeMusicID(Minecraft* pMinecraft, unsigned int i);
|
||||
|
||||
ma_engine m_engine;
|
||||
ma_engine_config m_engineConfig;
|
||||
|
|
|
|||
Loading…
Reference in a new issue