Remove strength sound mutator hook

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index f84538d769d4f9e22a06c462b71cb65313a09b83..e961e29415ff16f26a0c53c9b915a2a99a58f930 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -117,12 +117,9 @@ vector w_shotend;
 .float prevstrengthsoundattempt;
 void W_PlayStrengthSound(entity player) // void W_PlayStrengthSound
 {
-       if(MUTATOR_CALLHOOK(PlayStrengthSound))
-               return;
-               
-               if((player.items & IT_STRENGTH)
-                       && ((time > player.prevstrengthsound + autocvar_sv_strengthsound_antispam_time) // prevent insane sound spam
-                       || (time > player.prevstrengthsoundattempt + autocvar_sv_strengthsound_antispam_refire_threshold)))
+       if((player.items & IT_STRENGTH)
+               && ((time > player.prevstrengthsound + autocvar_sv_strengthsound_antispam_time) // prevent insane sound spam
+               || (time > player.prevstrengthsoundattempt + autocvar_sv_strengthsound_antispam_refire_threshold)))
                {
                        sound(player, CH_TRIGGER, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
                        player.prevstrengthsound = time;

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index 8cd28c102e69491e2347d46b3c338a5cd42e61a6..d74201f976f9445a56e4da5a98599f9d227a4999 100644 (file)
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -123,9 +123,6 @@ MUTATOR_HOOKABLE(GetCvars);
        // INPUT:
                float get_cvars_f;
                string get_cvars_s;
-               
-MUTATOR_HOOKABLE(PlayStrengthSound);
-       // called when a player fires a weapon with the strength powerup
 
 MUTATOR_HOOKABLE(EditProjectile);
        // can edit any "just fired" projectile

diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_minstagib.qc
index afada904206dabedb8f409e138bde0243d88bb42..f8c833144c831657bee30197925fecf86efdbc96 100644 (file)
--- a/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@ -199,12 +199,6 @@ MUTATOR_HOOKFUNCTION(minstagib_ForbidThrowing)
        return TRUE;
 }
 
-MUTATOR_HOOKFUNCTION(minstagib_PlayStrengthSound)
-{
-       // You shall not play!
-       return TRUE;
-}
-
 MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
 {
        if(autocvar_g_friendlyfire == 0 && !IsDifferentTeam(frag_target, frag_attacker) && IS_PLAYER(frag_target))
@@ -396,7 +390,6 @@ MUTATOR_DEFINITION(mutator_minstagib)
        MUTATOR_HOOK(PlayerPhysics, minstagib_PlayerPhysics, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerSpawn, minstagib_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDamage_Calculate, minstagib_PlayerDamage, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayStrengthSound, minstagib_PlayStrengthSound, CBC_ORDER_ANY);
        MUTATOR_HOOK(MakePlayerObserver, minstagib_MakePlayerObserver, CBC_ORDER_ANY);
        MUTATOR_HOOK(SetStartItems, minstagib_SetStartItems, CBC_ORDER_ANY);
        MUTATOR_HOOK(Item_GiveTo, minstagib_GiveItem, CBC_ORDER_ANY);