Nades: check return of Nade_TrailEffect

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 07228885db781391164839d875dc489315ce52bf..c83dc0551e49d661c40afb5a7e3e46adbfe6bbc3 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -326,7 +326,8 @@ void Ent_Projectile()
                                if (Nade_FromProjectile(self.cnt) != NADE_TYPE_Null)
                                {
                                        setmodel(self, MDL_PROJECTILE_NADE);
-                                       self.traileffect = _particleeffectnum(Nade_TrailEffect(self.cnt, self.team));
+                                       string trail = Nade_TrailEffect(self.cnt, self.team);
+                                       if (trail) self.traileffect = _particleeffectnum(trail);
                                        break;
                                }
                                error("Received invalid CSQC projectile, can't work with this!");

diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index ba189c9bf8dc38cb416107cf24682f67e89eea05..1ec1b9ec7e3782d4161618204989e0fd6707e117 100644 (file)
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -112,8 +112,13 @@ entity Nade_FromProjectile(float proj)
     return NADE_TYPE_Null;
 }
 
-string Nade_TrailEffect(float proj, float nade_team)
+string Nade_TrailEffect(int proj, float nade_team)
 {
+    switch (proj)
+    {
+        case PROJECTILE_NADE:       return EFFECT_NADE_TRAIL(nade_team).eent_eff_name;
+        case PROJECTILE_NADE_BURN:  return EFFECT_NADE_TRAIL_BURN(nade_team).eent_eff_name;
+    }
     FOREACH(NADES, true, LAMBDA(
         for (int j = 0; j < 2; j++)
         {
@@ -125,12 +130,7 @@ string Nade_TrailEffect(float proj, float nade_team)
             }
         }
     ));
-    switch (proj)
-    {
-        case PROJECTILE_NADE:       return EFFECT_NADE_TRAIL(nade_team).eent_eff_name;
-        case PROJECTILE_NADE_BURN:  return EFFECT_NADE_TRAIL_BURN(nade_team).eent_eff_name;
-    }
-    return "";
+    return string_null;
 }
 
 #ifdef SVQC