X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fexplosion_equation.qc;h=df71154be885faea83287a56d6a131da2746ca21;hb=4905fe11570838a598c060e789f317f58ea6d1e4;hp=3a18e8010028f3c5c3b7b14a77b7aad5cac57c95;hpb=f8f76acce46b329e8a9335ac001589b3f32d1891;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/explosion_equation.qc b/qcsrc/common/explosion_equation.qc index 3a18e8010..df71154be 100644 --- a/qcsrc/common/explosion_equation.qc +++ b/qcsrc/common/explosion_equation.qc @@ -42,9 +42,8 @@ vector damage_explosion_calcpush(vector explosion_f, vector target_v, float spee if(speedfactor < 1) return explosion_f; - float m; - #if 0 + float m; // find m so that // speedfactor * (1 + e) * m / (1 + m) == 1 m = 1 / ((1 + 0) * speedfactor - 1); @@ -59,5 +58,5 @@ vector damage_explosion_calcpush(vector explosion_f, vector target_v, float spee (target_v + v) * (target_v + v))); return v; #endif - return explosion_f * explosion_calcpush_getmultiplier(explosion_f * speedfactor, target_v) * (1.0 / speedfactor); + return explosion_f * explosion_calcpush_getmultiplier(explosion_f * speedfactor, target_v); }