From: Mario <zacjardine@y7mail.com>
Date: Mon, 5 Oct 2015 09:44:48 +0000 (+1000)
Subject: Match master
X-Git-Tag: xonotic-v0.8.2~1875^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F233%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Match master
---

diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index ef43f746c..be9d353f3 100644
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -114,6 +114,12 @@ entity Nade_FromProjectile(float proj)
 
 entity Nade_TrailEffect(int proj, int nade_team)
 {
+    switch (proj)
+    {
+        case PROJECTILE_NADE:       return EFFECT_NADE_TRAIL(nade_team);
+        case PROJECTILE_NADE_BURN:  return EFFECT_NADE_TRAIL_BURN(nade_team);
+    }
+
     FOREACH(NADES, true, LAMBDA(
         for (int j = 0; j < 2; j++)
         {
@@ -125,11 +131,7 @@ entity Nade_TrailEffect(int proj, int nade_team)
             }
         }
     ));
-    switch (proj)
-    {
-        case PROJECTILE_NADE:       return EFFECT_NADE_TRAIL(nade_team);
-        case PROJECTILE_NADE_BURN:  return EFFECT_NADE_TRAIL_BURN(nade_team);
-    }
+
     return EFFECT_Null;
 }