mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-02-18 09:51:40 +00:00
fix a few bugs. basics seem to be working
This commit is contained in:
parent
5869cb693e
commit
4c4f40f137
2 changed files with 4 additions and 3 deletions
|
@ -176,10 +176,10 @@ QuatMult (const quat_t v1, const quat_t v2, quat_t out)
|
||||||
vec3_t v;
|
vec3_t v;
|
||||||
|
|
||||||
s = v1[0] * v2[0] - DotProduct (v1 + 1, v2 + 1);
|
s = v1[0] * v2[0] - DotProduct (v1 + 1, v2 + 1);
|
||||||
CrossProduct (v1, v2, v);
|
CrossProduct (v1 + 1, v2 + 1, v);
|
||||||
VectorMultAdd (v, v1[0], v2 + 1, v);
|
VectorMultAdd (v, v1[0], v2 + 1, v);
|
||||||
out[0] = s;
|
|
||||||
VectorMultAdd (v, v2[0], v1 + 1, out + 1);
|
VectorMultAdd (v, v2[0], v1 + 1, out + 1);
|
||||||
|
out[0] = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__GNUC__)
|
#if defined(_WIN32) && !defined(__GNUC__)
|
||||||
|
|
|
@ -1781,7 +1781,8 @@ bitnot_expr:
|
||||||
expr_t *n = new_unary_expr (op, e);
|
expr_t *n = new_unary_expr (op, e);
|
||||||
type_t *t = get_type (e);
|
type_t *t = get_type (e);
|
||||||
|
|
||||||
if (t != &type_integer && t != &type_float)
|
if (t != &type_integer && t != &type_float
|
||||||
|
&& t != &type_quaternion)
|
||||||
return error (e, "invalid type for unary ~");
|
return error (e, "invalid type for unary ~");
|
||||||
n->e.expr.type = t;
|
n->e.expr.type = t;
|
||||||
return n;
|
return n;
|
||||||
|
|
Loading…
Reference in a new issue