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..a0931c2b9104a13e5e63e4767764059468fe2198 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)// || !g_lms)
+                               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)// || !g_lms)
+                               nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall));
+                       else
+                               nade_emerald_randomweapons(e, org);
+               }
                return;
        }
 }

diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc
index 588aa92bd9b6da31bf2f606969f540629008d53a..13edd957ccfb24e8183ba445d3120a89b2066f6b 100644 (file)
--- a/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@ -20,6 +20,7 @@
 
 //SMB mods
 #include <server/mute.qc>
+#include <server/modinfo.qc>
 //
 
 #include <server/player.qc>