RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust to make the logic tell the truth

This commit is contained in:
Cary Sandvig 2001-05-03 23:10:25 +00:00
parent bcbb805744
commit c1917eff4b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/audio/audio_manager.I
View File

@ -206,7 +206,7 @@ INLINE void AudioManager::set_music_active(bool f) {
////////////////////////////////////////////////////////////////////
INLINE bool AudioManager::get_sfx_active(void) {
get_ptr();
return AudioManager::_sfx_active;
return (AudioManager::_sfx_active && audio_is_active);
}
////////////////////////////////////////////////////////////////////
@ -216,7 +216,7 @@ INLINE bool AudioManager::get_sfx_active(void) {
////////////////////////////////////////////////////////////////////
INLINE bool AudioManager::get_music_active(void) {
get_ptr();
return AudioManager::_music_active;
return (AudioManager::_music_active && audio_is_active);
}
////////////////////////////////////////////////////////////////////