team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make sure things drop to the ground after getting pushed over a ledge. 

fix some warnings.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4608 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-02-13 23:49:36 +00:00
parent a50af06efc
commit d502211d75
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/server/sv_phys.c
View File

@ -364,7 +364,6 @@ static int WPhys_FlyMove (world_t *w, wedict_t *ent, const vec3_t gravitydir, fl
{
vec3_t move;
vec3_t from;
float firstfrac = trace.fraction;
VectorCopy(trace.endpos, from); //just in case
VectorSubtract(end, trace.endpos, move);
@ -863,7 +862,8 @@ static qboolean WPhys_Push (world_t *w, wedict_t *pusher, vec3_t move, vec3_t am
moved_edict[num_moved] = check;
num_moved++;
// check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
if (check->v->groundentity != pusher->entnum)
check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
// try moving the contacted entity
VectorAdd (check->v->origin, move, check->v->origin);
@ -1112,7 +1112,6 @@ static void WPhys_Physics_Noclip (world_t *w, wedict_t *ent)
{
vec3_t move;
vec3_t from;
float firstfrac = trace.fraction;
VectorCopy(trace.endpos, from); //just in case
VectorSubtract(end, trace.endpos, move);
WPhys_PortalTransform(w, ent, impact, from, move);