From 01e60834fa3826938bb1f14f432093f8f09ad262 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Fri, 17 Sep 2021 13:10:46 +0200 Subject: [PATCH] Use precache_generic() for sounds that are played client-side (#934) --- plugins/cmdmenu.sma | 10 +--------- plugins/cstrike/miscstats.sma | 2 +- plugins/dod/statssounds.sma | 28 ++++++++++++++-------------- plugins/tfc/statssounds.sma | 28 ++++++++++++++-------------- plugins/ts/stats.sma | 4 ++-- plugins/ts/statssounds.sma | 28 ++++++++++++++-------------- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/plugins/cmdmenu.sma b/plugins/cmdmenu.sma index e2b75ffd..df4e2d88 100755 --- a/plugins/cmdmenu.sma +++ b/plugins/cmdmenu.sma @@ -173,15 +173,7 @@ public plugin_precache( ) } if ( file_exists( szSound ) ) { - if ( sndExt[1] == 'm') - { - precache_generic( szSound ); // mp3 - } - else - { - replace( szSound, charsmax(szSound), "sound/", "" ); // wav, strip the leading sound/ we added for our file_exists check - precache_sound( szSound ); - } + precache_generic( szSound ); } } line++; diff --git a/plugins/cstrike/miscstats.sma b/plugins/cstrike/miscstats.sma index 5cb80ca7..1a623115 100755 --- a/plugins/cstrike/miscstats.sma +++ b/plugins/cstrike/miscstats.sma @@ -377,7 +377,7 @@ precache_sound_custom( const sound[] ) formatex(fullpathsound, charsmax(fullpathsound), "sound/%s.wav", sound) if( file_exists(fullpathsound) ) { - precache_sound(fullpathsound[6]) + precache_generic(fullpathsound) } else { diff --git a/plugins/dod/statssounds.sma b/plugins/dod/statssounds.sma index f9eb5adc..014b8dc1 100755 --- a/plugins/dod/statssounds.sma +++ b/plugins/dod/statssounds.sma @@ -14,21 +14,21 @@ #include public plugin_precache(){ - precache_sound( "misc/impressive.wav") - precache_sound( "misc/headshot.wav") - precache_sound( "misc/multikill.wav") - precache_sound( "misc/doublekill.wav") - precache_sound( "misc/godlike.wav") - precache_sound( "misc/ultrakill.wav") - precache_sound( "misc/killingspree.wav") - precache_sound( "misc/rampage.wav") - precache_sound( "misc/unstoppable.wav") - precache_sound( "misc/monsterkill.wav") - precache_sound( "misc/humiliation.wav") + precache_generic( "sound/misc/impressive.wav") + precache_generic( "sound/misc/headshot.wav") + precache_generic( "sound/misc/multikill.wav") + precache_generic( "sound/misc/doublekill.wav") + precache_generic( "sound/misc/godlike.wav") + precache_generic( "sound/misc/ultrakill.wav") + precache_generic( "sound/misc/killingspree.wav") + precache_generic( "sound/misc/rampage.wav") + precache_generic( "sound/misc/unstoppable.wav") + precache_generic( "sound/misc/monsterkill.wav") + precache_generic( "sound/misc/humiliation.wav") - precache_sound( "misc/takenlead.wav" ) - precache_sound( "misc/tiedlead.wav" ) - precache_sound( "misc/lostlead.wav" ) + precache_generic( "sound/misc/takenlead.wav" ) + precache_generic( "sound/misc/tiedlead.wav" ) + precache_generic( "sound/misc/lostlead.wav" ) return PLUGIN_CONTINUE } diff --git a/plugins/tfc/statssounds.sma b/plugins/tfc/statssounds.sma index f5827e08..dcd9503d 100755 --- a/plugins/tfc/statssounds.sma +++ b/plugins/tfc/statssounds.sma @@ -14,21 +14,21 @@ #include public plugin_precache(){ - precache_sound( "misc/impressive.wav") - precache_sound( "misc/headshot.wav") - precache_sound( "misc/multikill.wav") - precache_sound( "misc/doublekill.wav") - precache_sound( "misc/godlike.wav") - precache_sound( "misc/ultrakill.wav") - precache_sound( "misc/killingspree.wav") - precache_sound( "misc/rampage.wav") - precache_sound( "misc/unstoppable.wav") - precache_sound( "misc/monsterkill.wav") - precache_sound( "misc/humiliation.wav") + precache_generic( "sound/misc/impressive.wav") + precache_generic( "sound/misc/headshot.wav") + precache_generic( "sound/misc/multikill.wav") + precache_generic( "sound/misc/doublekill.wav") + precache_generic( "sound/misc/godlike.wav") + precache_generic( "sound/misc/ultrakill.wav") + precache_generic( "sound/misc/killingspree.wav") + precache_generic( "sound/misc/rampage.wav") + precache_generic( "sound/misc/unstoppable.wav") + precache_generic( "sound/misc/monsterkill.wav") + precache_generic( "sound/misc/humiliation.wav") - precache_sound( "misc/takenlead.wav" ) - precache_sound( "misc/tiedlead.wav" ) - precache_sound( "misc/lostlead.wav" ) + precache_generic( "sound/misc/takenlead.wav" ) + precache_generic( "sound/misc/tiedlead.wav" ) + precache_generic( "sound/misc/lostlead.wav" ) return PLUGIN_CONTINUE } diff --git a/plugins/ts/stats.sma b/plugins/ts/stats.sma index 6dfe0891..a3964992 100755 --- a/plugins/ts/stats.sma +++ b/plugins/ts/stats.sma @@ -92,8 +92,8 @@ new g_HeadShots[7][] = { } public plugin_precache(){ - precache_sound( "misc/headshot.wav") - precache_sound( "misc/doublekill.wav") + precache_generic( "sound/misc/headshot.wav") + precache_generic( "sound/misc/doublekill.wav") return PLUGIN_CONTINUE } diff --git a/plugins/ts/statssounds.sma b/plugins/ts/statssounds.sma index 20598000..73578d6e 100755 --- a/plugins/ts/statssounds.sma +++ b/plugins/ts/statssounds.sma @@ -14,21 +14,21 @@ #include public plugin_precache(){ - precache_sound( "misc/impressive.wav") - precache_sound( "misc/headshot.wav") - precache_sound( "misc/multikill.wav") - precache_sound( "misc/doublekill.wav") - precache_sound( "misc/godlike.wav") - precache_sound( "misc/ultrakill.wav") - precache_sound( "misc/killingspree.wav") - precache_sound( "misc/rampage.wav") - precache_sound( "misc/unstoppable.wav") - precache_sound( "misc/monsterkill.wav") - precache_sound( "misc/humiliation.wav") + precache_generic( "sound/misc/impressive.wav") + precache_generic( "sound/misc/headshot.wav") + precache_generic( "sound/misc/multikill.wav") + precache_generic( "sound/misc/doublekill.wav") + precache_generic( "sound/misc/godlike.wav") + precache_generic( "sound/misc/ultrakill.wav") + precache_generic( "sound/misc/killingspree.wav") + precache_generic( "sound/misc/rampage.wav") + precache_generic( "sound/misc/unstoppable.wav") + precache_generic( "sound/misc/monsterkill.wav") + precache_generic( "sound/misc/humiliation.wav") - precache_sound( "misc/takenlead.wav" ) - precache_sound( "misc/tiedlead.wav" ) - precache_sound( "misc/lostlead.wav" ) + precache_generic( "sound/misc/takenlead.wav" ) + precache_generic( "sound/misc/tiedlead.wav" ) + precache_generic( "sound/misc/lostlead.wav" ) return PLUGIN_CONTINUE }