Use normal weapons in Clan Arena

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 3bd7846b89ea4399e8be8d13d05645a0cb2afc92..0cd918caae428cef85f8c7320833753e3d5bd0cd 100644 (file)
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -262,8 +262,6 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
                return;\r
        if (!cvar("g_pickup_items"))\r
                return;\r
                return;\r
        if (!cvar("g_pickup_items"))\r
                return;\r

-       if (g_ca)\r
-               return;\r

        if(!cvar("g_weapon_throwable"))\r
                return;\r
        if(cvar("g_weapon_stay") == 1)\r
        if(!cvar("g_weapon_throwable"))\r
                return;\r
        if(cvar("g_weapon_stay") == 1)\r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 357e93ce73992f59a2690c6691541e0477bc7f3a..766b57c6bc11278f4f137374e1e1b7bfdc608659 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -874,7 +874,7 @@ void readplayerstartcvars()
        start_health = cvar("g_balance_health_start");\r
        start_armorvalue = cvar("g_balance_armor_start");\r
 \r
        start_health = cvar("g_balance_health_start");\r
        start_armorvalue = cvar("g_balance_armor_start");\r
 \r

-       if (g_lms || g_ca)\r
+       if (g_lms)\r

        {\r
                start_ammo_fuel = cvar("g_lms_start_ammo_fuel");\r
                start_health = cvar("g_lms_start_health");\r
        {\r
                start_ammo_fuel = cvar("g_lms_start_ammo_fuel");\r
                start_health = cvar("g_lms_start_health");\r


@@ -907,23 +907,20 @@ void readplayerstartcvars()
                warmup_start_armorvalue = start_armorvalue;\r
                warmup_start_weapons = start_weapons;\r
 \r
                warmup_start_armorvalue = start_armorvalue;\r
                warmup_start_weapons = start_weapons;\r
 \r

-               if (!g_ca)\r
+               if (cvar("g_use_ammunition"))\r

                {\r
                {\r

-                       if (cvar("g_use_ammunition"))\r
-                       {\r
-                               warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");\r
-                       }\r
-                       warmup_start_health = cvar("g_warmup_start_health");\r
-                       warmup_start_armorvalue = cvar("g_warmup_start_armor");\r
-                       warmup_start_weapons = 0;\r
-                       for (i = WEP_FIRST; i <= WEP_LAST; ++i)\r
+                       warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");\r
+               }\r
+               warmup_start_health = cvar("g_warmup_start_health");\r
+               warmup_start_armorvalue = cvar("g_warmup_start_armor");\r
+               warmup_start_weapons = 0;\r
+               for (i = WEP_FIRST; i <= WEP_LAST; ++i)\r
+               {\r
+                       e = get_weaponinfo(i);\r
+                       if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))\r

                        {\r
                        {\r

-                               e = get_weaponinfo(i);\r
-                               if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))\r
-                               {\r
-                                       warmup_start_weapons |= e.weapons;\r
-                                       weapon_action(e.weapon, WR_PRECACHE);\r
-                               }\r
+                               warmup_start_weapons |= e.weapons;\r
+                               weapon_action(e.weapon, WR_PRECACHE);\r

                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 918347f5c3dd88164bacbec30f69c36c10227ed5..37995acb43a0d20c5f40a643bec63e1f105d0465 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -625,7 +625,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 \r
                weaponsInMap |= weaponid;\r
 \r
 \r
                weaponsInMap |= weaponid;\r
 \r

-               if(g_lms || g_ca)\r
+               if(g_lms)\r

                {\r
                        startitem_failed = TRUE;\r
                        remove(self);\r
                {\r
                        startitem_failed = TRUE;\r
                        remove(self);\r