qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-18 09:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make SV_PushEntity easier to read.

Browse source
This commit is contained in:
Bill Currie 2011-12-22 10:45:52 +09:00
parent b54f0587d1
commit 4ade879674
2 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nq/source/sv_phys.c
View file

@ -370,22 +370,26 @@ SV_PushEntity (edict_t *ent, vec3_t push)
{ {
trace_t trace; trace_t trace;
vec3_t end; vec3_t end;
vec_t *e_origin, *e_mins, *e_maxs;
int e_movetype, e_solid;
VectorAdd (SVvector (ent, origin), push, end); e_origin = SVvector (ent, origin);
e_mins = SVvector (ent, mins);
e_maxs = SVvector (ent, maxs);
e_movetype = SVfloat (ent, movetype);
e_solid = SVfloat (ent, solid);
if (SVfloat (ent, movetype) == MOVETYPE_FLYMISSILE) VectorAdd (e_origin, push, end);
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins),
SVvector (ent, maxs), end, MOVE_MISSILE, ent); if (e_movetype == MOVETYPE_FLYMISSILE)
else if (SVfloat (ent, solid) == SOLID_TRIGGER trace = SV_Move (e_origin, e_mins, e_maxs, end, MOVE_MISSILE, ent);
|| SVfloat (ent, solid) == SOLID_NOT) else if (e_solid == SOLID_TRIGGER || e_solid == SOLID_NOT)
// clip against only bmodels // clip against only bmodels
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins), trace = SV_Move (e_origin, e_mins, e_maxs, end, MOVE_NOMONSTERS, ent);
SVvector (ent, maxs), end, MOVE_NOMONSTERS, ent);
else else
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins), trace = SV_Move (e_origin, e_mins, e_maxs, end, MOVE_NORMAL, ent);
SVvector (ent, maxs), end, MOVE_NORMAL, ent);
VectorCopy (trace.endpos, SVvector (ent, origin)); VectorCopy (trace.endpos, e_origin);
SV_LinkEdict (ent, true); SV_LinkEdict (ent, true);
if (trace.ent) if (trace.ent)

26
qw/source/sv_phys.c
View file

@ -373,22 +373,26 @@ SV_PushEntity (edict_t *ent, vec3_t push)
{ {
trace_t trace; trace_t trace;
vec3_t end; vec3_t end;
vec_t *e_origin, *e_mins, *e_maxs;
int e_movetype, e_solid;
VectorAdd (SVvector (ent, origin), push, end); e_origin = SVvector (ent, origin);
e_mins = SVvector (ent, mins);
e_maxs = SVvector (ent, maxs);
e_movetype = SVfloat (ent, movetype);
e_solid = SVfloat (ent, solid);
if (SVfloat (ent, movetype) == MOVETYPE_FLYMISSILE) VectorAdd (e_origin, push, end);
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins),
SVvector (ent, maxs), end, MOVE_MISSILE, ent); if (e_movetype == MOVETYPE_FLYMISSILE)
else if (SVfloat (ent, solid) == SOLID_TRIGGER trace = SV_Move (e_origin, e_mins, e_maxs, end, MOVE_MISSILE, ent);
|| SVfloat (ent, solid) == SOLID_NOT) else if (e_solid == SOLID_TRIGGER || e_solid == SOLID_NOT)
// clip against only bmodels // clip against only bmodels
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins), trace = SV_Move (e_origin, e_mins, e_maxs, end, MOVE_NOMONSTERS, ent);
SVvector (ent, maxs), end, MOVE_NOMONSTERS, ent);
else else
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins), trace = SV_Move (e_origin, e_mins, e_maxs, end, MOVE_NORMAL, ent);
SVvector (ent, maxs), end, MOVE_NORMAL, ent);
VectorCopy (trace.endpos, SVvector (ent, origin)); VectorCopy (trace.endpos, e_origin);
SV_LinkEdict (ent, true); SV_LinkEdict (ent, true);
if (trace.ent) if (trace.ent)