X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fcalculations.qc;h=16b507d14eee683e65c13e28a42399efdd48054f;hb=96e1acc3050bcb718e2f06702e5b88a60459a015;hp=183a5e5ed0f829e6867b23046c8514d52f046c6c;hpb=3c7ef5b449d479f9a2e24fdddf767f87208c9be6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/calculations.qc b/qcsrc/common/weapons/calculations.qc index 183a5e5ed..16b507d14 100644 --- a/qcsrc/common/weapons/calculations.qc +++ b/qcsrc/common/weapons/calculations.qc @@ -55,11 +55,11 @@ vector damage_explosion_calcpush(vector explosion_f, vector target_v, float spee v = explosion_calcpush(explosion_f * speedfactor, m, target_v, 1, 0); // the factor we then get is: // 1 - print(sprintf("MASS: %f\nv: %v -> %v\nENERGY BEFORE == %f + %f = %f\nENERGY AFTER >= %f\n", + LOG_INFOF("MASS: %f\nv: %v -> %v\nENERGY BEFORE == %f + %f = %f\nENERGY AFTER >= %f\n", m, target_v, target_v + v, target_v * target_v, m * explosion_f * speedfactor * explosion_f * speedfactor, target_v * target_v + m * explosion_f * speedfactor * explosion_f * speedfactor, - (target_v + v) * (target_v + v))); + (target_v + v) * (target_v + v)); return v; #endif return explosion_f * explosion_calcpush_getmultiplier(explosion_f * speedfactor, target_v); @@ -129,16 +129,16 @@ vector solve_cubic_abcd(float a, float b, float c, float d) v = solve_cubic_pq(p, q); v = (v - b * '1 1 1') * (1.0 / (3.0 * a)); if(a < 0) - v += '1 0 -1' * (v_z - v_x); // swap x, z + v += '1 0 -1' * (v.z - v.x); // swap x, z return v; } vector findperpendicular(vector v) { vector p; - p_x = v_z; - p_y = -v_x; - p_z = v_y; + p.x = v.z; + p.y = -v.x; + p.z = v.y; return normalize(cliptoplane(p, v)); } @@ -152,7 +152,7 @@ vector W_CalculateSpread(vector forward, float spread, float spreadfactor, float if(spread <= 0) return forward; sstyle = spreadstyle; //autocvar_g_projectiles_spread_style; - + if(sstyle == 0) { // this is the baseline for the spread value!