Use normal weapons in Clan Arena
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 8 Sep 2010 15:29:22 +0000 (18:29 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 8 Sep 2010 15:29:22 +0000 (18:29 +0300)
data/qcsrc/server/cl_weapons.qc
data/qcsrc/server/miscfunctions.qc
data/qcsrc/server/t_items.qc

index 3bd7846..0cd918c 100644 (file)
@@ -262,8 +262,6 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
                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
index 357e93c..766b57c 100644 (file)
@@ -874,7 +874,7 @@ void readplayerstartcvars()
        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
@@ -907,23 +907,20 @@ void readplayerstartcvars()
                warmup_start_armorvalue = start_armorvalue;\r
                warmup_start_weapons = start_weapons;\r
 \r
-               if (!g_ca)\r
+               if (cvar("g_use_ammunition"))\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
-                               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
index 918347f..37995ac 100644 (file)
@@ -625,7 +625,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 \r
                weaponsInMap |= weaponid;\r
 \r
-               if(g_lms || g_ca)\r
+               if(g_lms)\r
                {\r
                        startitem_failed = TRUE;\r
                        remove(self);\r