Add ForbidThrowCurrentWeapon hook to CA and cleanup some checks

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e4bd6852185d7e753a88a18009c39c2be981a27b..306e40f8675b6364078b2865d165abf03cd2af2f 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -293,7 +293,7 @@ entity SelectSpawnPoint (float anypoint)
        else
        {
                float mindist;
-               if (arena_roundbased && !g_ca)
+               if (g_arena && arena_roundbased)
                        mindist = 800;
                else
                        mindist = 100;

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 35b9203093c5af5e86b04f44a18db854c5ef562e..81102d62da9ac07cdf500e40f32b36f3f9cf5acb 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -312,8 +312,6 @@ float W_IsWeaponThrowable(float w)
                return 0;
        if (g_lms)
                return 0;
-       if (g_ca)
-               return 0;
        if (g_cts)
                return 0;
        if (g_nexball && w == WEP_GRENADE_LAUNCHER)

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 1e7d2815d501af4bc8bb9d1df2177e7b13bbbcdb..0528c7dbcf6867e71982e60c3a0c65c9849e768f 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -131,9 +131,8 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 
        PlayerScore_Add(targ, SP_DEATHS, 1);
 
-       if(g_arena || g_ca)
-               if(autocvar_g_arena_roundbased)
-                       return;
+       if(g_arena && arena_roundbased)
+               return;
 
        if(targ != attacker) // not for suicides
        if(g_weaponarena_random)

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 8f6d6923eb2d5ef720bfc29edcba2c4dcfc2507d..0db2c5beb6f2a2d7524bab24f210e5b4afe0070f 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -180,6 +180,10 @@ MUTATOR_HOOKFUNCTION(ca_ForbidPlayerScore_Clear)
 {
        return 1;
 }
+MUTATOR_HOOKFUNCTION(ca_ForbidThrowCurrentWeapon)
+{
+       return 1;
+}
 
 void ca_Initialize()
 {
@@ -201,6 +205,7 @@ MUTATOR_DEFINITION(gamemode_ca)
        MUTATOR_HOOK(GetTeamCount, ca_GetTeamCount, CBC_ORDER_EXCLUSIVE);
        MUTATOR_HOOK(PlayerPreThink, ca_PlayerPreThink, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidPlayerScore_Clear, ca_ForbidPlayerScore_Clear, CBC_ORDER_ANY);
+       MUTATOR_HOOK(ForbidThrowCurrentWeapon, ca_ForbidThrowCurrentWeapon, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {