ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-02-18 01:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

add check for cl_musicenabled before initing fmod

Browse source
This commit is contained in:
pierow 2023-09-07 14:39:33 -04:00
parent a4970388ef
commit 5cf36cb28f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/source/mod/AvHHud.cpp
View file

@ -6524,7 +6524,7 @@ void AvHHud::UpdateAmbientSounds()
for(AmbientSoundListType::iterator theIter = this->mAmbientSounds.begin(); theIter != this->mAmbientSounds.end(); theIter++) for(AmbientSoundListType::iterator theIter = this->mAmbientSounds.begin(); theIter != this->mAmbientSounds.end(); theIter++)
{ {
if (CVAR_GET_FLOAT("cl_ambientsound") != 0) if (CVAR_GET_FLOAT("cl_ambientsound") != 0 || CVAR_GET_FLOAT("cl_musicenabled") != 0)
theIter->StartPlayingIfNot(); theIter->StartPlayingIfNot();
theIter->UpdateVolume(theListenerPosition); theIter->UpdateVolume(theListenerPosition);

4
main/source/ui/UIHud.cpp
View file

@ -530,7 +530,7 @@ int UIHud::Redraw(float flTime, int intermission)
} }
// Initialize music the first time through // Initialize music the first time through
if (CVAR_GET_FLOAT("cl_ambientsound") != 0) if (CVAR_GET_FLOAT("cl_ambientsound") != 0 || CVAR_GET_FLOAT("cl_musicenabled") != 0)
this->InitializeSound(); this->InitializeSound();
} }
@ -628,7 +628,7 @@ bool UIHud::Update(float inCurrentTime, string& outError)
this->mManager.Update(inCurrentTime); this->mManager.Update(inCurrentTime);
bool theSuccess = true; bool theSuccess = true;
if (CVAR_GET_FLOAT("cl_ambientsound") != 0) { if (CVAR_GET_FLOAT("cl_ambientsound") != 0 || CVAR_GET_FLOAT("cl_musicenabled") != 0) {
this->UpdateMusic(inCurrentTime); this->UpdateMusic(inCurrentTime);
//bool theSuccess = this->UpdateInternetStream(inCurrentTime, outError); //bool theSuccess = this->UpdateInternetStream(inCurrentTime, outError);