LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-25 00:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::wstring

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:50:22 -06:00
parent 41db813a6d
commit cdc08700e4
581 changed files with 2156 additions and 2154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp
+7 -7
View File
@@ -438,7 +438,7 @@ void SoundEngine::XACTNotificationCallback( const XACT_NOTIFICATION* pNotificati
}
}
char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpaces)
char *SoundEngine::ConvertSoundPathToName(const std::wstring& name, bool bConvertSpaces)
{
static char buf[256];
assert(name.length()<256);
@@ -468,7 +468,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
{
return;
}
wstring name = wchSoundNames[iSound];
std::wstring name = wchSoundNames[iSound];
//const unsigned char *name=ucSoundNames[iSound];
char *xboxName = ConvertSoundPathToName(name);
@@ -576,7 +576,7 @@ void SoundEngine::playUI(int iSound, float, float)
{
return;
}
wstring name = wchSoundNames[iSound];
std::wstring name = wchSoundNames[iSound];
char *xboxName = (char *)ConvertSoundPathToName(name);
@@ -635,7 +635,7 @@ void SoundEngine::playUI(int iSound, float, float)
cueInstance->Play();
}
void SoundEngine::playStreaming(const wstring& name, float x, float y, float z, float vol, float pitch, bool bMusicDelay)
void SoundEngine::playStreaming(const std::wstring& name, float x, float y, float z, float vol, float pitch, bool bMusicDelay)
{
IXACT3SoundBank *pSoundBank=NULL;
@@ -1065,14 +1065,14 @@ void SoundEngine::tick(std::shared_ptr<Mob> *players, float a)
m_pXACT3Engine->DoWork();
}
void SoundEngine::add(const wstring& name, File *file)
void SoundEngine::add(const std::wstring& name, File *file)
{
}
void SoundEngine::addMusic(const wstring& name, File *file)
void SoundEngine::addMusic(const std::wstring& name, File *file)
{
}
void SoundEngine::addStreaming(const wstring& name, File *file)
void SoundEngine::addStreaming(const std::wstring& name, File *file)
{
}
Minecraft.Client/Platform/Xbox/Audio/SoundEngine.h
+5 -5
View File
@@ -79,7 +79,7 @@ public:
SoundEngine();
virtual void destroy();
virtual void play(int iSound, float x, float y, float z, float volume, float pitch);
virtual void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true);
virtual void playStreaming(const std::wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true);
virtual void playUI(int iSound, float volume, float pitch);
virtual void playMusicTick();
virtual void updateMusicVolume(float fVal);
@@ -87,16 +87,16 @@ public:
virtual void updateSoundEffectVolume(float fVal);
virtual void init(Options *);
virtual void tick(std::shared_ptr<Mob> *players, float a); // 4J - updated to take array of local players rather than single one
virtual void add(const wstring& name, File *file);
virtual void addMusic(const wstring& name, File *file);
virtual void addStreaming(const wstring& name, File *file);
virtual void add(const std::wstring& name, File *file);
virtual void addMusic(const std::wstring& name, File *file);
virtual void addStreaming(const std::wstring& name, File *file);
#ifndef __PS3__
static void setXACTEngine( IXACT3Engine *pXACT3Engine);
void CreateStreamingWavebank(const char *pchName, IXACT3WaveBank **ppStreamedWaveBank);
void CreateSoundbank(const char *pchName, IXACT3SoundBank **ppSoundBank);
#endif // __PS3__
virtual char *ConvertSoundPathToName(const wstring& name, bool bConvertSpaces=false);
virtual char *ConvertSoundPathToName(const std::wstring& name, bool bConvertSpaces=false);
bool isStreamingWavebankReady(); // 4J Added
#ifdef _XBOX
bool isStreamingWavebankReady(IXACT3WaveBank *pWaveBank);