diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 78851563..ea742781 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -833,7 +833,7 @@ int SoundEngine::getMusicID(int iDomain) Minecraft *pMinecraft=Minecraft::GetInstance(); // Before the game has started? - if(pMinecraft==nullptr) + if(pMinecraft == nullptr) { // any track from the overworld // return GetRandomishTrack(m_iStream_Overworld_Min,m_iStream_Overworld_Max); @@ -1324,8 +1324,9 @@ void SoundEngine::playMusicUpdate() } if(GetIsPlayingStreamingGameMusic()) { - bool playerInEnd = false; - bool playerInNether = false; + bool playerInEnd = false; + bool playerInNether = false; + Minecraft *pMinecraft = Minecraft::GetInstance(); unsigned int i = 0; @@ -1362,7 +1363,7 @@ void SoundEngine::playMusicUpdate() // Set the end track m_musicID = getMusicID(eMusicDomain_Nether); SetIsPlayingEndMusic(false); - SetIsPlayingNetherMusic(true); + SetIsPlayingNetherMusic(true); } else { @@ -1371,12 +1372,13 @@ void SoundEngine::playMusicUpdate() // Set the end track pickGameModeMusic(pMinecraft, i); SetIsPlayingEndMusic(false); - SetIsPlayingNetherMusic(false); + SetIsPlayingNetherMusic(false); } } else if (playerInNether && !GetIsPlayingNetherMusic()) { m_StreamState=eMusicStreamState_Stop; + // set the Nether track m_musicID = getMusicID(eMusicDomain_Nether); SetIsPlayingNetherMusic(true); @@ -1387,6 +1389,7 @@ void SoundEngine::playMusicUpdate() if(playerInEnd) { m_StreamState=eMusicStreamState_Stop; + // set the Nether track m_musicID = getMusicID(eMusicDomain_End); SetIsPlayingNetherMusic(false); @@ -1395,14 +1398,17 @@ void SoundEngine::playMusicUpdate() else { m_StreamState=eMusicStreamState_Stop; // + // set the Nether track pickGameModeMusic(pMinecraft, i); SetIsPlayingNetherMusic(false); SetIsPlayingEndMusic(false); } } - else if(!playerInEnd && !playerInNether) + else if ( !playerInEnd && !playerInNether ) + { pickGameModeMusic(pMinecraft, i); + } // volume change required? if (m_musicStreamActive) @@ -1456,10 +1462,12 @@ void SoundEngine::playMusicUpdate() { // random delay of up to 3 minutes for music m_iMusicDelay = random->nextInt(20 * 60 * 3);//random->nextInt(20 * 60 * 10) + 20 * 60 * 10; + // Check if we have a local player in The Nether or in The End, and play that music if they are - Minecraft *pMinecraft=Minecraft::GetInstance(); - bool playerInEnd=false; - bool playerInNether=false; + Minecraft *pMinecraft = Minecraft::GetInstance(); + + bool playerInEnd = false; + bool playerInNether = false; unsigned int i = 0; for (i = 0; i < MAX_LOCAL_PLAYERS; i++) @@ -1467,9 +1475,13 @@ void SoundEngine::playMusicUpdate() if(pMinecraft->localplayers[i] != nullptr) { if(pMinecraft->localplayers[i]->dimension == LevelData::DIMENSION_END) + { playerInEnd = true; + } else if(pMinecraft->localplayers[i]->dimension == LevelData::DIMENSION_NETHER) + { playerInNether = true; + } } } diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index 4d099532..b810e4d8 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png index 02686b3e..32f489ec 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png index dddef615..02d73af2 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png differ diff --git a/Minecraft.Client/Windows64Media/Tutorial/Tutorial.mcs b/Minecraft.Client/Windows64Media/Tutorial/Tutorial.mcs new file mode 100644 index 00000000..99f9f5ca Binary files /dev/null and b/Minecraft.Client/Windows64Media/Tutorial/Tutorial.mcs differ diff --git a/Minecraft.Client/Windows64Media/Tutorial/Tutorial.pck b/Minecraft.Client/Windows64Media/Tutorial/Tutorial.pck index d5e1d6b0..f05788b3 100644 Binary files a/Minecraft.Client/Windows64Media/Tutorial/Tutorial.pck and b/Minecraft.Client/Windows64Media/Tutorial/Tutorial.pck differ