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

A trace toss, and a small fix so dropping entities in hexen2 play the right sounds. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@319 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-10-13 06:35:27 +00:00
parent 3e75ffd266
commit e7b1517ccd
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engine/server/sv_phys.c
View File

@ -1091,7 +1091,12 @@ void SV_Physics_Step (edict_t *ent)
if ( (int)ent->v.flags & FL_ONGROUND ) // just hit ground
{
if (hitsound)
SV_StartSound (ent, 0, "demon/dland2.wav", 255, 1);
{
if (progstype == PROG_H2)
SV_StartSound (ent, 0, "fx/thngland.wav", 255, 1);
else
SV_StartSound (ent, 0, "demon/dland2.wav", 255, 1);
}
}
}
@ -1706,6 +1711,47 @@ void SV_RunNewmis (void)
host_frametime = pr_global_struct->frametime;
}
trace_t SV_Trace_Toss (edict_t *tossent, edict_t *ignore)
{
int i;
float gravity;
vec3_t move, end;
trace_t trace;
vec3_t origin, velocity;
// this has to fetch the field from the original edict, since our copy is truncated
gravity = tossent->v.gravity;
if (!gravity)
gravity = 1.0;
gravity *= sv_gravity.value * 0.05;
VectorCopy (tossent->v.origin, origin);
SV_CheckVelocity (tossent);
for (i = 0;i < 200;i++) // LordHavoc: sanity check; never trace more than 10 seconds
{
velocity[2] -= gravity;
VectorScale (velocity, 0.05, move);
VectorAdd (origin, move, end);
trace = SV_Move (origin, tossent->v.mins, tossent->v.maxs, end, MOVE_NORMAL, tossent);
VectorCopy (trace.endpos, origin);
if (trace.fraction < 1 && trace.ent && trace.ent != ignore)
break;
if (Length(velocity) > sv_maxvelocity.value)
{
// Con_DPrintf("Slowing %s\n", PR_GetString(svprogfuncs, tossent->v.classname));
VectorScale (velocity, sv_maxvelocity.value/Length(velocity), velocity);
}
}
trace.fraction = 0; // not relevant
return trace;
}
/*
================
SV_Physics