From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 9 Mar 2015 13:09:09 +0000 (+0100)
Subject: Disable lightning arc branching, as this can (and WILL) recurse infinitely.
X-Git-Tag: xonotic-v0.8.1~104
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=818fce31675b784a8b1b9b36c0f90fe1d3500eba;p=xonotic%2Fxonotic-data.pk3dir.git

Disable lightning arc branching, as this can (and WILL) recurse infinitely.
---

diff --git a/qcsrc/client/effects.qc b/qcsrc/client/effects.qc
index 7e0f1c6c5..95623505b 100644
--- a/qcsrc/client/effects.qc
+++ b/qcsrc/client/effects.qc
@@ -66,8 +66,9 @@ void cl_effects_lightningarc(vector from, vector to,float seglength,float drifts
             dirnew = normalize(direction * (1 - drift) + randomvec() * drift);
             pos = pos_l +  dirnew * steplength;
             te_lightning1(world,pos_l,pos);
-            if(random() < branchfactor)
-                cl_effects_lightningarc(pos, pos + (dirnew * length * 0.25),seglength,drifts,drifte,min(branchfactor + branchfactor_add,1),branchfactor_add);
+            // WTF endless recursion if branchfactor is 1.0 (possibly due to adding branchfactor_add). FIXME
+            // if(random() < branchfactor)
+            //     cl_effects_lightningarc(pos, pos + (dirnew * length * 0.25),seglength,drifts,drifte,min(branchfactor + branchfactor_add,1),branchfactor_add);
 
             pos_l = pos;
         }