Fix emerald nade when spawning weapons in CA, FT and LMS

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 95b49ec1da321509910c57b89bb8ab9e746315b8..4605dd794ff96b9b2d7b89c4584acc78afcd3f8a 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -796,7 +796,12 @@ void nade_emerald_randomitem(entity e, vector org)
                else if (c < 0.5)
                        nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shield : ITEM_Strength));
                else
-                       nade_emerald_randomweapons(e, org);
+               {
+                       if(!g_ca || !g_freezetag)
+                               nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall));
+                       else
+                               nade_emerald_randomweapons(e, org);
+               }
        }
        else
        {
@@ -805,7 +810,12 @@ void nade_emerald_randomitem(entity e, vector org)
                else if (d < 0.2)
                        nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shells : ITEM_Rockets));
                else
-                       nade_emerald_randomweapons(e, org);
+               {
+                       if(!g_ca || !g_freezetag)
+                               nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall));
+                       else
+                               nade_emerald_randomweapons(e, org);
+               }
                return;
        }
 }