]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Disable lightning arc branching, as this can (and WILL) recurse infinitely.
authorRudolf Polzer <divverent@xonotic.org>
Mon, 9 Mar 2015 13:09:09 +0000 (14:09 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 9 Mar 2015 13:09:09 +0000 (14:09 +0100)
qcsrc/client/effects.qc

index 7e0f1c6c5feaf70f3d1c0b66618c7ec8c7a4a255..95623505b83e297d2a7e63e12a4f78e378838d5b 100644 (file)
@@ -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;
         }