Removes unnecessary references to static _soundDict

JujuAdams · Sep 9, 2024 · ae28cc4 · ae28cc4
1 parent 2943ccb
commit ae28cc4
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 16 deletions.
diff --git a/scripts/VinylGetMetadata/VinylGetMetadata.gml b/scripts/VinylGetMetadata/VinylGetMetadata.gml
@@ -8,7 +8,6 @@
 
 function VinylGetMetadata(_pattern, _default = undefined)
 {
-    static _soundDict   = __VinylSystem().__soundDict;
     static _patternDict = __VinylSystem().__patternDict;
 
     if (is_handle(_pattern))

diff --git a/scripts/VinylPlay/VinylPlay.gml b/scripts/VinylPlay/VinylPlay.gml
@@ -20,7 +20,6 @@
 
 function VinylPlay(_pattern, _loop = undefined, _gain = 1, _pitch = 1, _duckerName = undefined, _duckPrio = undefined)
 {
-    static _soundDict   = __VinylSystem().__soundDict;
     static _patternDict = __VinylSystem().__patternDict;
 
     if (is_handle(_pattern))

diff --git a/scripts/VinylPlayOn/VinylPlayOn.gml b/scripts/VinylPlayOn/VinylPlayOn.gml
@@ -21,7 +21,6 @@
 
 function VinylPlayOn(_emitter, _pattern, _loop = undefined, _gain = 1, _pitch = 1, _duckerName = undefined, _duckPrio = undefined)
 {
-    static _soundDict   = __VinylSystem().__soundDict;
     static _patternDict = __VinylSystem().__patternDict;
 
     if (is_handle(_pattern))

diff --git a/scripts/VinylSetMixForAssetTag/VinylSetMixForAssetTag.gml b/scripts/VinylSetMixForAssetTag/VinylSetMixForAssetTag.gml
@@ -9,7 +9,6 @@ function VinylSetMixForAssetTag(_mixName, _assetTag)
 {
     static _system        = __VinylSystem();
     static _toUpdateArray = _system.__toUpdateArray;
-    static _soundDict     = _system.__soundDict;
 
     if (_mixName == VINYL_NO_MIX) _mixName = undefined;
 

diff --git a/scripts/VinylSetMixForAssets/VinylSetMixForAssets.gml b/scripts/VinylSetMixForAssets/VinylSetMixForAssets.gml
@@ -11,7 +11,6 @@ function VinylSetMixForAssets()
 {
     static _system        = __VinylSystem();
     static _toUpdateArray = _system.__toUpdateArray;
-    static _soundDict     = _system.__soundDict;
     static _patternDict   = _system.__patternDict;
 
     var _mixName = argument[0];

diff --git a/scripts/VinylSetupExportJSON/VinylSetupExportJSON.gml b/scripts/VinylSetupExportJSON/VinylSetupExportJSON.gml
@@ -11,7 +11,7 @@
 
 function VinylSetupExportJSON(_ignoreEmpty = true)
 {
-    static _duckerArray    = __VinylSystem().__duckerArray;
+    static _duckerArray  = __VinylSystem().__duckerArray;
     static _mixDict      = __VinylSystem().__mixDict;
     static _patternDict  = __VinylSystem().__patternDict;
     static _soundDict    = __VinylSystem().__soundDict;

diff --git a/scripts/VinylSetupSound/VinylSetupSound.gml b/scripts/VinylSetupSound/VinylSetupSound.gml
@@ -20,8 +20,7 @@
 
 function VinylSetupSound(_sound, _gain = 1, _pitch = 1, _loop = undefined, _mixName = VINYL_DEFAULT_MIX, _duckerName = undefined, _duckPrio = undefined, _emitterAlias = undefined, _metadata = undefined)
 {
-    static _system    = __VinylSystem();
-    static _soundDict = _system.__soundDict;
+    static _system = __VinylSystem();
 
     if (is_array(_gain))
     {

diff --git a/scripts/__VinylClassPatternBlend/__VinylClassPatternBlend.gml b/scripts/__VinylClassPatternBlend/__VinylClassPatternBlend.gml
@@ -12,7 +12,6 @@
 
 function __VinylClassPatternBlend(_patternName, _soundArray, _loop, _gain, _animCurve, _mixName, _duckerName, _duckPrio, _metadata) constructor
 {
-    static _soundDict     = __VinylSystem().__soundDict;
     static _toUpdateArray = __VinylSystem().__toUpdateArray;
 
 

diff --git a/scripts/__VinylClassVoiceBlend/__VinylClassVoiceBlend.gml b/scripts/__VinylClassVoiceBlend/__VinylClassVoiceBlend.gml
@@ -11,7 +11,6 @@
 
 function __VinylClassVoiceBlend(_emitter, _pattern, _loopLocal, _gainLocal, _pitchLocal, _duckerNameLocal, _duckPrioLocal, _mixName) constructor
 {
-    static _soundDict        = __VinylSystem().__soundDict;
     static _mixDict          = __VinylSystem().__mixDict;
     static _duckerDict       = __VinylSystem().__duckerDict;
     static _voiceToStructMap = __VinylSystem().__voiceToStructMap;

diff --git a/scripts/__VinylClassVoiceQueue/__VinylClassVoiceQueue.gml b/scripts/__VinylClassVoiceQueue/__VinylClassVoiceQueue.gml
@@ -10,7 +10,6 @@ function __VinylClassVoiceQueue(_behaviour, _loopQueue, _gainLocal, _emitter) co
     static _queueCount = 0;
 
     static _duckerDict       = __VinylSystem().__duckerDict;
-    static _soundDict        = __VinylSystem().__soundDict;
     static _voiceToStructMap = __VinylSystem().__voiceToStructMap;
     static _voiceUpdateArray = __VinylSystem().__voiceUpdateArray;
     static _toUpdateArray    = __VinylSystem().__toUpdateArray;

diff --git a/scripts/__VinylClassVoiceSound/__VinylClassVoiceSound.gml b/scripts/__VinylClassVoiceSound/__VinylClassVoiceSound.gml
@@ -14,7 +14,6 @@
 
 function __VinylClassVoiceSound(_voice, _loopLocal, _gainSound, _gainLocal, _gainMix, _gainDuck, _pitchSound, _pitchLocal, _duckerNameLocal, _duckPrioLocal, _pattern) constructor
 {
-    static _soundDict        = __VinylSystem().__soundDict;
     static _voiceToStructMap = __VinylSystem().__voiceToStructMap;
     static _voiceUpdateArray = __VinylSystem().__voiceUpdateArray;
     static _toUpdateArray    = __VinylSystem().__toUpdateArray;

diff --git a/scripts/__VinylEnsureSoundVoice/__VinylEnsureSoundVoice.gml b/scripts/__VinylEnsureSoundVoice/__VinylEnsureSoundVoice.gml
@@ -5,7 +5,6 @@
 function __VinylEnsureSoundVoice(_voice)
 {
     static _voiceToStructMap = __VinylSystem().__voiceToStructMap;
-    static _soundDict        = __VinylSystem().__soundDict;
     static _mixDict          = __VinylSystem().__mixDict;
     static _nullVoice        = __VinylSystem().__nullVoice;
 

diff --git a/scripts/__VinylSetupExportGML/__VinylSetupExportGML.gml b/scripts/__VinylSetupExportGML/__VinylSetupExportGML.gml
@@ -13,7 +13,7 @@
 
 function __VinylSetupExportGML(_useMacros = false, _ignoreEmpty = true)
 {
-    static _duckerDict     = __VinylSystem().__duckerDict;
+    static _duckerDict   = __VinylSystem().__duckerDict;
     static _mixDict      = __VinylSystem().__mixDict;
     static _patternDict  = __VinylSystem().__patternDict;
     static _soundDict    = __VinylSystem().__soundDict;

diff --git a/scripts/__VinylSoundGetGain/__VinylSoundGetGain.gml b/scripts/__VinylSoundGetGain/__VinylSoundGetGain.gml
@@ -2,6 +2,5 @@
 
 function __VinylSoundGetGain(_sound)
 {
-    static _soundDict = __VinylSystem().__soundDict;
     return __VinylEnsurePatternSound(_sound).__gain;
 }
diff --git a/scripts/__VinylSoundGetPitch/__VinylSoundGetPitch.gml b/scripts/__VinylSoundGetPitch/__VinylSoundGetPitch.gml
@@ -2,6 +2,5 @@
 
 function __VinylSoundGetPitch(_sound)
 {
-    static _soundDict = __VinylSystem().__soundDict;
     return __VinylEnsurePatternSound(_sound).__pitch;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ @@
     function __VinylClassPatternBlend(_patternName, _soundArray, _loop, _gain, _animCurve, _mixName, _duckerName, _duckPrio, _metadata) constructor
     {
-        static _soundDict     = __VinylSystem().__soundDict;
         static _toUpdateArray = __VinylSystem().__toUpdateArray;
@@ Expand Down @@