phase out faston.wav (#614)

profezzorn · Dec 27, 2023 · d3c5cc6 · d3c5cc6
1 parent 13bfbd3
commit d3c5cc6
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/props/saber_BC_buttons.h b/props/saber_BC_buttons.h
@@ -59,7 +59,9 @@ Optional #defines:
                                   Exit by not swinging for 1 second.
 #define FEMALE_TALKIE_VOICE     - To use a female voice version of onboard Talkie.
 #define NO_VOLUME_MENU          - Option to omit On-the-fly Volume menu control with buttons.
-
+#define ENABLE_FASTON           - Use faston.wav for FastOn() ignitions, such as gesture ignitions or fast preset change.
+                                  The faston.wav sound will be replaced with fastout.wav. 
+                                  If you have a good reason to keep faston.wav as is, please post at https://crucible.hubbe.net/
 ---------------------------------------------------------------------------
 Gesture Controls:
 - There are four gesture types: swing, stab, thrust and twist.
@@ -380,9 +382,10 @@ EFFECT(volup);      // for increse volume
 EFFECT(voldown);    // for decrease volume
 EFFECT(volmin);     // for minimum volume reached
 EFFECT(volmax);     // for maximum volume reached
-EFFECT(faston);     // for EFFECT_FAST_ON
-                    // *note* faston.wav does not replace out.wav.
-                    // they play layered and concurrently.
+#ifdef ENABLE_FASTON
+#warning The faston.wav sound will be replaced with fastout.wav. If you have a good reason to keep faston.wav as is, please post at https://crucible.hubbe.net/
+EFFECT(faston);     // for EFFECT_FAST_ON. Being replaced by fastout.wav, which is already defined in the main OS.
+#endif
 EFFECT(blstbgn);    // for Begin Multi-Blast
 EFFECT(blstend);    // for End Multi-Blast
 EFFECT(push);       // for Force Push gesture
@@ -1166,9 +1169,9 @@ class SaberBCButtons : public PROP_INHERIT_PREFIX PropBase {
         return;
       // Gesture on, bybass preon
       case EFFECT_FAST_ON:
-        if (SFX_faston) {
-          hybrid_font.PlayCommon(&SFX_faston);
-        }
+#ifdef ENABLE_FASTON
+        if (SFX_faston) hybrid_font.PlayCommon(&SFX_faston);
+#endif
         scroll_presets_ = false;
         return;
       case EFFECT_FAST_OFF: