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

Make qw's push/block handing the same as nq's.

Browse source 
NQ's handling seems to be more correct. The only likely problems are if
something is pushed into (eg) a button, and things will be a little slower.
This commit is contained in:
Bill Currie 2011-12-22 13:08:24 +09:00
parent 3eb788b3f6
commit 2bec1ae1d9
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nq/source/sv_phys.c
View file

@ -413,7 +413,7 @@ SV_Push (edict_t *pusher, const vec3_t tmove, const vec3_t amove)
vec3_t up = {0, 0, 1};
int mark;
int c_flags, c_movetype, c_groundentity, c_solid;
vec_t *c_absmin, *c_absmax, *c_origin, *c_mins, *c_maxs;
vec_t *c_absmin, *c_absmax, *c_origin, *c_angles, *c_mins, *c_maxs;
vec_t *p_origin, *p_angles;
VectorAdd (SVvector (pusher, absmin), tmove, mins);
@ -505,8 +505,8 @@ SV_Push (edict_t *pusher, const vec3_t tmove, const vec3_t amove)
block = SV_TestEntityPosition (check);
if (!block) {
VectorAdd (SVvector (check, angles), amove,
SVvector (check, angles));
c_angles = SVvector (check, angles);
VectorAdd (c_angles, amove, c_angles);
continue;
}
// if it is still inside the pusher, block

18
qw/source/sv_phys.c
View file

@ -416,7 +416,7 @@ SV_Push (edict_t *pusher, const vec3_t tmove, const vec3_t amove)
vec3_t up = {0, 0, 1};
int mark;
int c_flags, c_movetype, c_groundentity, c_solid;
vec_t *c_absmin, *c_absmax, *c_origin, *c_mins, *c_maxs;
vec_t *c_absmin, *c_absmax, *c_origin, *c_angles, *c_mins, *c_maxs;
vec_t *p_origin, *p_angles;
VectorAdd (SVvector (pusher, absmin), tmove, mins);
@ -501,17 +501,15 @@ SV_Push (edict_t *pusher, const vec3_t tmove, const vec3_t amove)
VectorAdd (move, tmove, move);
// try moving the contacted entity
VectorAdd (c_origin, move, c_origin);
block = SV_TestEntityPosition (check);
if (!block) { // pushed ok
SV_LinkEdict (check, false);
continue;
}
// if it is ok to leave in the old position, do it
VectorSubtract (c_origin, move, c_origin);
solid_save = SVfloat (pusher, solid);
SVfloat (pusher, solid) = SOLID_NOT;
SV_PushEntity (check, move);
SVfloat (pusher, solid) = solid_save;
block = SV_TestEntityPosition (check);
if (!block) {
num_moved--;
c_angles = SVvector (check, angles);
VectorAdd (c_angles, amove, c_angles);
continue;
}
// if it is still inside the pusher, block