qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-16 17:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bring qw's entity-in-solid check into nq's SV_Push.

Browse source
This commit is contained in:
Bill Currie 2011-12-22 10:24:01 +09:00
parent 7243de0d90
commit b54f0587d1
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nq/source/sv_phys.c
View file

@ -448,6 +448,15 @@ SV_Push (edict_t *pusher, const vec3_t tmove, const vec3_t amove)
|| c_movetype == MOVETYPE_NOCLIP)
continue;
// If the entity is in another solid, it's not free to move. Make the
// pusher non-solid to ensure it doesn't interfere with the check.
solid_save = SVfloat (pusher, solid);
SVfloat (pusher, solid) = SOLID_NOT;
block = SV_TestEntityPosition (check);
SVfloat (pusher, solid) = solid_save;
if (block)
continue;
// if the entity is standing on the pusher, it will definately be moved
c_flags = SVfloat (check, flags);
c_groundentity = SVentity (check, groundentity);