Fix music selection to match TU19 behavior

Menu music (menu1-4) now plays only on the title screen, creative
music (creative1-6) only plays in creative mode, and survival mode
correctly plays only calm/hal/nuance/piano tracks. Reordered the
eMUSICFILES enum so piano tracks are contiguous with the survival
range, added game-mode-aware track selection via getOverworldMusicID,
and re-enabled the playStreaming call in setLevel to stop menu music
when entering gameplay. Added debug logging for track selection.

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -8,6 +8,8 @@
 #include "..\..\Minecraft.World\mth.h"
 #include "..\..\TexturePackRepository.h"
 #include "..\..\DLCTexturePack.h"
+#include "..\..\MultiPlayerGameMode.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
 #include "Common\DLC\DLCAudioFile.h"
 
 #ifdef __PSVITA__
@@ -114,6 +116,9 @@ const char *SoundEngine::m_szStreamFileA[eStream_Max]=
 	"hal4",
 	"nuance1",
 	"nuance2",
+	"piano1",
+	"piano2",
+	"piano3",
 
 #ifndef _XBOX
 	"creative1",
@@ -128,10 +133,6 @@ const char *SoundEngine::m_szStreamFileA[eStream_Max]=
 	"menu4",
 #endif
 
-	"piano1",
-	"piano2",
-	"piano3",
-
 	// Nether
 	"nether1",
 	"nether2",
@@ -409,6 +410,13 @@ SoundEngine::SoundEngine()
 		eStream_end_dragon,eStream_end_end,
 		eStream_CD_1);
 
+#ifndef _XBOX
+	m_iStream_Creative_Min = eStream_Overworld_Creative1;
+	m_iStream_Creative_Max = eStream_Overworld_Creative6;
+	m_iStream_Menu_Min = eStream_Overworld_Menu1;
+	m_iStream_Menu_Max = eStream_Overworld_Menu4;
+#endif
+
 	m_musicID=getMusicID(LevelData::DIMENSION_OVERWORLD);
 
 	m_StreamingAudioInfo.bIs3D=false;
@@ -806,6 +814,46 @@ int SoundEngine::GetRandomishTrack(int iStart,int iEnd)
 	app.DebugPrintf("Select track %d\n",iVal);
 	return iVal;
 }
+
+/////////////////////////////////////////////
+//
+//	getOverworldMusicID - selects overworld music based on game mode
+//
+/////////////////////////////////////////////
+int SoundEngine::getOverworldMusicID(Minecraft *pMinecraft)
+{
+#ifndef _XBOX
+	// Check if any local player is in creative mode
+	bool isCreative = false;
+	for(unsigned int i = 0; i < MAX_LOCAL_PLAYERS; i++)
+	{
+		if(pMinecraft->localplayers[i] != nullptr && pMinecraft->localgameModes[i] != nullptr)
+		{
+			GameType *mode = pMinecraft->localgameModes[i]->getLocalPlayerMode();
+			if(mode != nullptr && mode->isCreative())
+			{
+				isCreative = true;
+				break;
+			}
+		}
+	}
+
+	if(isCreative)
+	{
+		// Creative: survival tracks + creative tracks
+		int survivalCount = m_iStream_Overworld_Max - m_iStream_Overworld_Min + 1;
+		int creativeCount = m_iStream_Creative_Max - m_iStream_Creative_Min + 1;
+		int pick = random->nextInt(survivalCount + creativeCount);
+		if(pick < survivalCount)
+			return GetRandomishTrack(m_iStream_Overworld_Min, m_iStream_Overworld_Max);
+		else
+			return GetRandomishTrack(m_iStream_Creative_Min, m_iStream_Creative_Max);
+	}
+#endif
+	// Survival/Adventure: survival tracks only
+	return GetRandomishTrack(m_iStream_Overworld_Min, m_iStream_Overworld_Max);
+}
+
 /////////////////////////////////////////////
 //
 //	getMusicID
@@ -813,29 +861,33 @@ int SoundEngine::GetRandomishTrack(int iStart,int iEnd)
 /////////////////////////////////////////////
 int SoundEngine::getMusicID(int iDomain)
 {
-	int iRandomVal=0;
+	int result=-1;
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// Before the game has started?
 	if(pMinecraft==nullptr)
 	{
-		// any track from the overworld
-		return GetRandomishTrack(m_iStream_Overworld_Min,m_iStream_Overworld_Max);
+#ifndef _XBOX
+		// Title screen: play menu music
+		result = GetRandomishTrack(m_iStream_Menu_Min,m_iStream_Menu_Max);
+#else
+		result = GetRandomishTrack(m_iStream_Overworld_Min,m_iStream_Overworld_Max);
+#endif
 	}
-
-	if(pMinecraft->skins->isUsingDefaultSkin())
+	else if(pMinecraft->skins->isUsingDefaultSkin())
 	{
 		switch(iDomain)
 		{
 		case LevelData::DIMENSION_END:
 			// the end isn't random - it has different music depending on whether the dragon is alive or not, but we've not added the dead dragon music yet
-			return m_iStream_End_Min;
+			result = m_iStream_End_Min;
+			break;
 		case LevelData::DIMENSION_NETHER:
-			return GetRandomishTrack(m_iStream_Nether_Min,m_iStream_Nether_Max);
-			//return m_iStream_Nether_Min + random->nextInt(m_iStream_Nether_Max-m_iStream_Nether_Min);
+			result = GetRandomishTrack(m_iStream_Nether_Min,m_iStream_Nether_Max);
+			break;
 		default: //overworld
-			//return m_iStream_Overworld_Min + random->nextInt(m_iStream_Overworld_Max-m_iStream_Overworld_Min);
-			return GetRandomishTrack(m_iStream_Overworld_Min,m_iStream_Overworld_Max);
+			result = getOverworldMusicID(pMinecraft);
+			break;
 		}
 	}
 	else
@@ -844,15 +896,22 @@ int SoundEngine::getMusicID(int iDomain)
 		switch(iDomain)
 		{
 		case LevelData::DIMENSION_END:
-			return GetRandomishTrack(m_iStream_End_Min,m_iStream_End_Max);
+			result = GetRandomishTrack(m_iStream_End_Min,m_iStream_End_Max);
+			break;
 		case LevelData::DIMENSION_NETHER:
-			//return m_iStream_Nether_Min + random->nextInt(m_iStream_Nether_Max-m_iStream_Nether_Min);
-			return GetRandomishTrack(m_iStream_Nether_Min,m_iStream_Nether_Max);
+			result = GetRandomishTrack(m_iStream_Nether_Min,m_iStream_Nether_Max);
+			break;
 		default: //overworld
-			//return m_iStream_Overworld_Min + random->nextInt(m_iStream_Overworld_Max-m_iStream_Overworld_Min);
-			return GetRandomishTrack(m_iStream_Overworld_Min,m_iStream_Overworld_Max);
+			result = getOverworldMusicID(pMinecraft);
+			break;
 		}
 	}
+
+#ifdef _DEBUG
+	if(result >= 0 && result < eStream_Max)
+		app.DebugPrintf("getMusicID: selected track '%s' (id=%d, domain=%d)\n", m_szStreamFileA[result], result, iDomain);
+#endif
+	return result;
 }
 
 /////////////////////////////////////////////

Minecraft.Client/Common/Audio/SoundEngine.h

@@ -1,4 +1,5 @@
 #pragma once
+class Minecraft;
 class Mob;
 class Options;
 using namespace std;
@@ -25,8 +26,10 @@ enum eMUSICFILES
 	eStream_Overworld_hal4,
 	eStream_Overworld_nuance1,
 	eStream_Overworld_nuance2,
+	eStream_Overworld_piano1,
+	eStream_Overworld_piano2,
+	eStream_Overworld_piano3, // <-- make piano3 the last survival overworld one
 #ifndef _XBOX
-	// Add the new music tracks
 	eStream_Overworld_Creative1,
 	eStream_Overworld_Creative2,
 	eStream_Overworld_Creative3,
@@ -38,9 +41,6 @@ enum eMUSICFILES
 	eStream_Overworld_Menu3,
 	eStream_Overworld_Menu4,
 #endif
-	eStream_Overworld_piano1,
-	eStream_Overworld_piano2,
-	eStream_Overworld_piano3, // <-- make piano3 the last overworld one
 	// Nether
 	eStream_Nether1,
 	eStream_Nether2,
@@ -136,6 +136,7 @@ public:
 	bool isStreamingWavebankReady();		// 4J Added
 	int getMusicID(int iDomain);
 	int getMusicID(const wstring& name);
+	int getOverworldMusicID(Minecraft *pMinecraft);
 	void SetStreamingSounds(int iOverworldMin, int iOverWorldMax, int iNetherMin, int iNetherMax, int iEndMin, int iEndMax, int iCD1);
 	void updateMiniAudio();
 	void playMusicUpdate();
@@ -187,6 +188,10 @@ private:
 	int m_iStream_Nether_Min,m_iStream_Nether_Max;
 	int m_iStream_End_Min,m_iStream_End_Max;
 	int m_iStream_CD_1;
+#ifndef _XBOX
+	int m_iStream_Creative_Min, m_iStream_Creative_Max;
+	int m_iStream_Menu_Min, m_iStream_Menu_Max;
+#endif
 	bool *m_bHeardTrackA;
 
 	std::unordered_map<int, std::vector<std::string>> m_soundPathCache;   // play(): sound ID → all valid variant paths

Minecraft.Client/Minecraft.cpp

@@ -4330,8 +4330,8 @@ void Minecraft::setLevel(MultiPlayerLevel *level, int message /*=-1*/, shared_pt
 		this->progressRenderer->progressStage(-1);
 	}
 
-	// 4J-PB - since we now play music in the menu, just let it keep playing
-	//soundEngine->playStreaming(L"", 0, 0, 0, 0, 0);
+	// Stop menu music and transition to game music for the new level
+	soundEngine->playStreaming(L"", 0, 0, 0, 1, 1);
 
 	// 4J - stop update thread from processing this level, which blocks until it is safe to move on - will be re-enabled if we set the level to be non-nullptr
 	gameRenderer->DisableUpdateThread();

Minecraft.Client/MultiPlayerGameMode.h

@@ -27,6 +27,7 @@ public:
 	void adjustPlayer(shared_ptr<Player> player);
 	bool isCutScene();
 	void setLocalMode(GameType *mode);
+	GameType* getLocalPlayerMode() const { return localPlayerMode; }
     virtual void initPlayer(shared_ptr<Player> player);
 	virtual bool canHurtPlayer();
     virtual bool destroyBlock(int x, int y, int z, int face);