backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-06-20 08:02:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 0fc81f0fe9 into 09df8928ee

Browse source
This commit is contained in:
str1k3r 2026-05-07 14:29:33 -07:00 committed by GitHub
parent 09df8928ee 0fc81f0fe9
commit b85eddaf8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/CMakeLists.txt
View file

@ -72,7 +72,7 @@ endforeach()
# ---
include("${CMAKE_SOURCE_DIR}/cmake/CopyAssets.cmake")
set(ASSET_FOLDER_PAIRS
"${CMAKE_CURRENT_SOURCE_DIR}/music" "music"
"${CMAKE_CURRENT_SOURCE_DIR}/Music" "${PLATFORM_NAME}Media/Music"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/Media" "Common/Media"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/res" "Common/res"
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media" "${PLATFORM_NAME}Media"

35
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -65,13 +65,29 @@ void SoundEngine::playMusicTick() {};
#ifdef _WINDOWS64
char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"music\\"};
char SoundEngine::m_szMusicPath[]={"Windows64Media\\Music\\"};
char SoundEngine::m_szRedistName[]={"redist64"};
#elif defined _DURANGO
char SoundEngine::m_szSoundPath[]={"Sound\\"};
char SoundEngine::m_szMusicPath[]={"music\\"};
char SoundEngine::m_szSoundPath[]={"Durango\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"DurangoMedia\\Music\\"};
char SoundEngine::m_szRedistName[]={"redist64"};
#elif defined __ORBIS__
char SoundEngine::m_szSoundPath[]={"Orbis\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"OrbisMedia\\Music\\"};
char SoundEngine::m_szRedistName[]={"redist64"};
#elif defined _XBOX
char SoundEngine::m_szSoundPath[]={"Xbox\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"XboxMedia\\Music\\"};
char SoundEngine::m_szRedistName[]={"redist"};
#elif defined __PSVITA__
char SoundEngine::m_szSoundPath[]={"PSVita\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"PSVitaMedia\\Music\\"};
char SoundEngine::m_szRedistName[]={"redist"};
#elif defined __PS3__
//extern const char* getPS3HomePath();
char SoundEngine::m_szSoundPath[]={"PS3\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"PS3Media\\Music\\"};
char SoundEngine::m_szRedistName[]={"redist"};
#ifdef _CONTENT_PACKAGE
char SoundEngine::m_szSoundPath[]={"Sound/"};
@ -81,17 +97,6 @@ char SoundEngine::m_szSoundPath[]={"Sound/"};
// just use the host Durango folder for the sound. In the content package, we'll have moved this in the .gp4 file
char SoundEngine::m_szSoundPath[]={"Durango/Sound/"};
#endif
char SoundEngine::m_szMusicPath[]={"music/"};
char SoundEngine::m_szRedistName[]={"redist64"};
#elif defined __PSVITA__
char SoundEngine::m_szSoundPath[]={"PSVita/Sound/"};
char SoundEngine::m_szMusicPath[]={"music/"};
char SoundEngine::m_szRedistName[]={"redist"};
#elif defined __PS3__
//extern const char* getPS3HomePath();
char SoundEngine::m_szSoundPath[]={"PS3/Sound/"};
char SoundEngine::m_szMusicPath[]={"music/"};
char SoundEngine::m_szRedistName[]={"redist"};
#define USE_SPURS
@ -1500,4 +1505,4 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac
return buf;
}
#endif
#endif