fastout

profezzorn · Dec 25, 2023 · 4f72fd9 · 4f72fd9
1 parent 0eadfa0
commit 4f72fd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/sound/effect.h b/sound/effect.h
@@ -720,6 +720,7 @@ EFFECT(blst);
 EFFECT(clsh);
 EFFECT2(in, pstoff);
 EFFECT(out);
+EFFECT(fastout);
 EFFECT2(lock, lock);
 EFFECT(swng);
 EFFECT(slsh);

diff --git a/sound/hybrid_font.h b/sound/hybrid_font.h
@@ -483,6 +483,7 @@ class HybridFont : public SaberBase, public Looper {
   void SB_On() override {
     // If preon exists, we've already queed up playing the poweron and hum.
     bool already_started = state_ == STATE_WAIT_FOR_ON && SFX_preon;
+    bool faston = state_ != STATE_WAIT_FOR_ON
     if (monophonic_hum_) {
       if (!already_started) {
         PlayMonophonic(&SFX_poweron, &SFX_hum);
@@ -509,7 +510,7 @@ class HybridFont : public SaberBase, public Looper {
       	  SaberBase::ClearSoundInfo();
       	}
       } else {
-        tmp = PlayPolyphonic(getOut());
+        tmp = PlayPolyphonic(faston && SFX_fastout ? &SFX_fastout : getOut());
       }
       hum_fade_in_ = 0.2;
       if (SFX_humm && tmp) {