Fixes some pitch-related crashes

JujuAdams · Sep 16, 2024 · 41a297d · 41a297d
1 parent cba3a81
commit 41a297d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/scripts/__VinylClassMix/__VinylClassMix.gml b/scripts/__VinylClassMix/__VinylClassMix.gml
@@ -25,7 +25,7 @@ function __VinylClassMix(_mixName, _gainPattern, _membersLoop, _membersDuckOn, _
     __gainLocalSpeed  = infinity;
 
     __pitchLocal       = 1;
-    __pitchLocalTarget = _pitchLocal;
+    __pitchLocalTarget = __pitchLocal;
     __pitchLocalSpeed  = infinity;
 
     __cleanUpIndex = 0;

diff --git a/scripts/__VinylClassVoiceShuffle/__VinylClassVoiceShuffle.gml b/scripts/__VinylClassVoiceShuffle/__VinylClassVoiceShuffle.gml
@@ -138,7 +138,7 @@ function __VinylClassVoiceShuffle(_sound, _voice, _loopLocal, _gainPattern, _gai
         if (__pitchLocal != __pitchLocalTarget)
         {
             __pitchLocal += clamp(__pitchLocalTarget - __pitchLocal, -_delta*__pitchLocalSpeed, _delta*__pitchLocalSpeed);
-            audio_sound_pitch(__voiceCurrent, __VINYL_VOICE_PITCH_SxPxLxM);
+            audio_sound_pitch(__voiceReference, __VINYL_VOICE_PITCH_SxPxLxM);
         }
 
         return true;
@@ -218,14 +218,22 @@ function __VinylClassVoiceShuffle(_sound, _voice, _loopLocal, _gainPattern, _gai
         if (_rateOfChange > 100)
         {
             __pitchLocal = _pitch;
-            audio_sound_pitch(__voiceCurrent, __VINYL_VOICE_PITCH_SxPxLxM);
+            audio_sound_pitch(__voiceReference, __VINYL_VOICE_PITCH_SxPxLxM);
+        }
+        else
+        {
+            if (not __inUpdateArray)
+            {
+                __inUpdateArray = true;
+                array_push(_voiceUpdateArray, self);
+            }
         }
     }
 
     static __SetMixPitch = function(_pitch)
     {
         __pitchMix = _pitch;
-        audio_sound_pitch(__voiceCurrent, __VINYL_VOICE_PITCH_SxPxLxM);
+        audio_sound_pitch(__voiceReference, __VINYL_VOICE_PITCH_SxPxLxM);
     }
 
     static __QueueUpdateForSound = function(_sound)

diff --git a/scripts/__VinylClassVoiceSound/__VinylClassVoiceSound.gml b/scripts/__VinylClassVoiceSound/__VinylClassVoiceSound.gml
@@ -135,7 +135,7 @@ function __VinylClassVoiceSound(_voice, _loopLocal, _gainSound, _gainLocal, _gai
         if (__pitchLocal != __pitchLocalTarget)
         {
             __pitchLocal += clamp(__pitchLocalTarget - __pitchLocal, -_delta*__pitchLocalSpeed, _delta*__pitchLocalSpeed);
-            audio_sound_pitch(__voiceCurrent, __VINYL_VOICE_PITCH_SxLxM);
+            audio_sound_pitch(__voiceReference, __VINYL_VOICE_PITCH_SxLxM);
         }
 
         return true;
@@ -215,14 +215,22 @@ function __VinylClassVoiceSound(_voice, _loopLocal, _gainSound, _gainLocal, _gai
         if (_rateOfChange > 100)
         {
             __pitchLocal = _pitch;
-            audio_sound_pitch(__voiceCurrent, __VINYL_VOICE_PITCH_SxLxM);
+            audio_sound_pitch(__voiceReference, __VINYL_VOICE_PITCH_SxLxM);
+        }
+        else
+        {
+            if (not __inUpdateArray)
+            {
+                __inUpdateArray = true;
+                array_push(_voiceUpdateArray, self);
+            }
         }
     }
 
     static __SetMixPitch = function(_pitch)
     {
         __pitchMix = _pitch;
-        audio_sound_pitch(__voiceCurrent, __VINYL_VOICE_PITCH_SxLxM);
+        audio_sound_pitch(__voiceReference, __VINYL_VOICE_PITCH_SxLxM);
     }
 
     static __QueueUpdateForSound = function(_sound)