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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user