Skip to content

Commit e6d0d83

Browse files
committed
make sd 0 work better
1 parent 58bcb3b commit e6d0d83

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

sound/hybrid_font.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -483,15 +483,16 @@ class HybridFont : public SaberBase, public Looper {
483483
bool most_blades = location.on_blade(0);
484484
// SFX_in.SetFollowing( most_blades ? &SFX_pstoff : nullptr );
485485
#ifdef ENABLE_IDLE_SOUND
486-
if (most_blades && !AvoidIdleSDAccess()) {
487-
if (SFX_pstoff) {
488-
SFX_in.SetFollowing(&SFX_pstoff);
489-
SFX_pstoff.SetFollowing(&SFX_idle);
490-
} else {
491-
SFX_in.SetFollowing(&SFX_idle);
492-
}
486+
if (most_blades) {
487+
Effect* idle = AvoidIdleSDAccess() ? nullptr : &SFX_idle;
488+
if (SFX_pstoff) {
489+
SFX_in.SetFollowing(&SFX_pstoff);
490+
SFX_pstoff.SetFollowing(idle);
491+
} else {
492+
SFX_in.SetFollowing(idle);
493+
}
493494
} else {
494-
SFX_in.SetFollowing(nullptr);
495+
SFX_in.SetFollowing(nullptr);
495496
}
496497
#else
497498
SFX_in.SetFollowing(most_blades ? &SFX_pstoff : nullptr);

0 commit comments

Comments
 (0)