*/
-cvar_t sv_friction = {CVAR_NOTIFY, "sv_friction","4", "how fast you slow down"};
-cvar_t sv_waterfriction = {CVAR_NOTIFY, "sv_waterfriction","-1", "how fast you slow down, if less than 0 the sv_friction variable is used instead"};
-cvar_t sv_stopspeed = {CVAR_NOTIFY, "sv_stopspeed","100", "how fast you come to a complete stop"};
-cvar_t sv_gravity = {CVAR_NOTIFY, "sv_gravity","800", "how fast you fall (512 = roughly earth gravity)"};
-cvar_t sv_maxvelocity = {CVAR_NOTIFY, "sv_maxvelocity","2000", "universal speed limit on all entities"};
-cvar_t sv_nostep = {CVAR_NOTIFY, "sv_nostep","0", "prevents MOVETYPE_STEP entities (monsters) from moving"};
-cvar_t sv_stepheight = {CVAR_NOTIFY, "sv_stepheight", "18", "how high you can step up (TW_SV_STEPCONTROL extension)"};
-cvar_t sv_jumpstep = {CVAR_NOTIFY, "sv_jumpstep", "0", "whether you can step up while jumping (sv_gameplayfix_stepwhilejumping must also be 1)"};
-cvar_t sv_wallfriction = {CVAR_NOTIFY, "sv_wallfriction", "1", "how much you slow down when sliding along a wall"};
-cvar_t sv_newflymove = {CVAR_NOTIFY, "sv_newflymove", "0", "enables simpler/buggier player physics (not recommended)"};
-cvar_t sv_freezenonclients = {CVAR_NOTIFY, "sv_freezenonclients", "0", "freezes time, except for players, allowing you to walk around and take screenshots of explosions"};
-cvar_t sv_playerphysicsqc = {CVAR_NOTIFY, "sv_playerphysicsqc", "1", "enables QuakeC function to override player physics"};
-cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0", "disables collision detection optimizations for debugging purposes"};
-
-cvar_t sv_sound_watersplash = {0, "sv_sound_watersplash", "misc/h2ohit1.wav", "sound to play when MOVETYPE_FLY/TOSS/BOUNCE/STEP entity enters or leaves water (empty cvar disables the sound)"};
-cvar_t sv_sound_land = {0, "sv_sound_land", "demon/dland2.wav", "sound to play when MOVETYPE_STEP entity hits the ground at high speed (empty cvar disables the sound)"};
-
-// TODO: move this extern to server.h
-extern cvar_t sv_clmovement_waitforinput;
-
#define MOVE_EPSILON 0.01
void SV_Physics_Toss (prvm_edict_t *ent);
-void SV_Phys_Init (void)
-{
- Cvar_RegisterVariable(&sv_stepheight);
- Cvar_RegisterVariable(&sv_jumpstep);
- Cvar_RegisterVariable(&sv_wallfriction);
- Cvar_RegisterVariable(&sv_newflymove);
- Cvar_RegisterVariable(&sv_freezenonclients);
- Cvar_RegisterVariable(&sv_playerphysicsqc);
- Cvar_RegisterVariable(&sv_debugmove);
-
- Cvar_RegisterVariable(&sv_sound_watersplash);
- Cvar_RegisterVariable(&sv_sound_land);
-}
-
/*
===============================================================================
// matrices to transform into/out of other entity's space
matrix4x4_t matrix, imatrix;
// model of other entity
- model_t *model;
+ dp_model_t *model;
// list of entities to test for collisions
int numtouchedicts;
prvm_edict_t *touchedicts[MAX_EDICTS];
Matrix4x4_CreateTranslate(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2]);
Matrix4x4_Invert_Simple(&imatrix, &matrix);
if ((int)touch->fields.server->flags & FL_MONSTER)
- Collision_ClipToGenericEntity(&trace, model, touch->fields.server->frame, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
+ Collision_ClipToGenericEntity(&trace, model, (int) touch->fields.server->frame, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
else
- Collision_ClipToGenericEntity(&trace, model, touch->fields.server->frame, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
+ Collision_ClipToGenericEntity(&trace, model, (int) touch->fields.server->frame, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.server->solid == SOLID_BSP);
}
}
#endif
+int SV_PointSuperContents(const vec3_t point)
+{
+ int supercontents = 0;
+ int i;
+ prvm_edict_t *touch;
+ vec3_t transformed;
+ // matrices to transform into/out of other entity's space
+ matrix4x4_t matrix, imatrix;
+ // model of other entity
+ dp_model_t *model;
+ unsigned int modelindex;
+ int frame;
+ // list of entities to test for collisions
+ int numtouchedicts;
+ prvm_edict_t *touchedicts[MAX_EDICTS];
+
+ // get world supercontents at this point
+ if (sv.worldmodel && sv.worldmodel->PointSuperContents)
+ supercontents = sv.worldmodel->PointSuperContents(sv.worldmodel, 0, point);
+
+ // if sv_gameplayfix_swiminbmodels is off we're done
+ if (!sv_gameplayfix_swiminbmodels.integer)
+ return supercontents;
+
+ // get list of entities at this point
+ numtouchedicts = World_EntitiesInBox(&sv.world, point, point, MAX_EDICTS, touchedicts);
+ if (numtouchedicts > MAX_EDICTS)
+ {
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
+ }
+ for (i = 0;i < numtouchedicts;i++)
+ {
+ touch = touchedicts[i];
+
+ // we only care about SOLID_BSP for pointcontents
+ if (touch->fields.server->solid != SOLID_BSP)
+ continue;
+
+ // might interact, so do an exact clip
+ modelindex = (unsigned int)touch->fields.server->modelindex;
+ if (modelindex >= MAX_MODELS)
+ continue;
+ model = sv.models[(int)touch->fields.server->modelindex];
+ if (!model || !model->PointSuperContents)
+ continue;
+ Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2], touch->fields.server->angles[0], touch->fields.server->angles[1], touch->fields.server->angles[2], 1);
+ Matrix4x4_Invert_Simple(&imatrix, &matrix);
+ Matrix4x4_Transform(&imatrix, point, transformed);
+ frame = (int)touch->fields.server->frame;
+ supercontents |= model->PointSuperContents(model, bound(0, frame, (model->numframes - 1)), transformed);
+ }
+
+ return supercontents;
+}
+
/*
===============================================================================
prvm_edict_t *touch, *touchedicts[MAX_EDICTS];
// build a list of edicts to touch, because the link loop can be corrupted
- // by SV_IncreaseEdicts called during touch functions
+ // by IncreaseEdicts called during touch functions
numtouchedicts = World_EntitiesInBox(&sv.world, ent->priv.server->areamins, ent->priv.server->areamaxs, MAX_EDICTS, touchedicts);
if (numtouchedicts > MAX_EDICTS)
{
*/
void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
{
- model_t *model;
+ dp_model_t *model;
vec3_t mins, maxs;
if (ent == prog->edicts)
if (ent->fields.server->solid == SOLID_BSP)
{
int modelindex = (int)ent->fields.server->modelindex;
- if (modelindex < 0 || modelindex > MAX_MODELS)
+ if (modelindex < 0 || modelindex >= MAX_MODELS)
{
Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
modelindex = 0;
model = sv.models[modelindex];
if (model != NULL)
{
- if (!model->TraceBox)
+ if (!model->TraceBox && developer.integer >= 1)
Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
if (ent->fields.server->angles[0] || ent->fields.server->angles[2] || ent->fields.server->avelocity[0] || ent->fields.server->avelocity[2])
returns true if the entity is in solid currently
============
*/
-static int SV_TestEntityPosition (prvm_edict_t *ent)
+static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset)
{
- trace_t trace = SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NOMONSTERS, ent, SUPERCONTENTS_SOLID);
+ vec3_t org;
+ trace_t trace;
+ VectorAdd(ent->fields.server->origin, offset, org);
+ trace = SV_Move (org, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NOMONSTERS, ent, SUPERCONTENTS_SOLID);
if (trace.startsupercontents & SUPERCONTENTS_SOLID)
return true;
else
// q1bsp/hlbsp use hulls and if the entity does not exactly match
// a hull size it is incorrectly tested, so this code tries to
// 'fix' it slightly...
+ // FIXME: this breaks entities larger than the hull size
int i;
vec3_t v, m1, m2, s;
- VectorAdd(ent->fields.server->origin, ent->fields.server->mins, m1);
- VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, m2);
+ VectorAdd(org, ent->fields.server->mins, m1);
+ VectorAdd(org, ent->fields.server->maxs, m2);
VectorSubtract(m2, m1, s);
#define EPSILON (1.0f / 32.0f)
if (s[0] >= EPSILON*2) {m1[0] += EPSILON;m2[0] -= EPSILON;}
return true;
}
}
- return false;
}
+ // if the trace found a better position for the entity, move it there
+ if (VectorDistance2(trace.endpos, ent->fields.server->origin) >= 0.0001)
+ {
+#if 0
+ // please switch back to this code when trace.endpos sometimes being in solid bug is fixed
+ VectorCopy(trace.endpos, ent->fields.server->origin);
+#else
+ // verify if the endpos is REALLY outside solid
+ VectorCopy(trace.endpos, org);
+ trace = SV_Move (org, ent->fields.server->mins, ent->fields.server->maxs, org, MOVE_NOMONSTERS, ent, SUPERCONTENTS_SOLID);
+ if(trace.startsolid)
+ Con_Printf("SV_TestEntityPosition: trace.endpos detected to be in solid. NOT using it.\n");
+ else
+ VectorCopy(org, ent->fields.server->origin);
+#endif
+ }
+ return false;
}
/*
|| check->fields.server->movetype == MOVETYPE_NOCLIP)
continue;
- if (SV_TestEntityPosition (check))
+ if (SV_TestEntityPosition (check, vec3_origin))
Con_Print("entity in invalid position\n");
}
}
PRVM_G_FLOAT(OFS_PARM0) = ent->fields.server->watertype;
// New Contents
PRVM_G_FLOAT(OFS_PARM1) = nContents;
+ // Assign Self
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
// Execute VM Function
PRVM_ExecuteProgram(contentstransition->function, "contentstransition: NULL function");
}
{
if (IS_NAN(ent->fields.server->velocity[i]))
{
- Con_Printf("Got a NaN velocity on %s\n", PRVM_GetString(ent->fields.server->classname));
+ Con_Printf("Got a NaN velocity on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(ent->fields.server->classname));
ent->fields.server->velocity[i] = 0;
}
if (IS_NAN(ent->fields.server->origin[i]))
{
- Con_Printf("Got a NaN origin on %s\n", PRVM_GetString(ent->fields.server->classname));
+ Con_Printf("Got a NaN origin on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(ent->fields.server->classname));
ent->fields.server->origin[i] = 0;
}
}
*/
qboolean SV_RunThink (prvm_edict_t *ent)
{
- float thinktime;
-
- thinktime = ent->fields.server->nextthink;
- if (thinktime <= 0 || thinktime > sv.time + sv.frametime)
- return true;
+ int iterations;
// don't let things stay in the past.
// it is possible to start that way by a trigger with a local time.
- if (thinktime < sv.time)
- thinktime = sv.time;
+ if (ent->fields.server->nextthink <= 0 || ent->fields.server->nextthink > sv.time + sv.frametime)
+ return true;
- ent->fields.server->nextthink = 0;
- prog->globals.server->time = thinktime;
- prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
- prog->globals.server->other = PRVM_EDICT_TO_PROG(prog->edicts);
- PRVM_ExecuteProgram (ent->fields.server->think, "QC function self.think is missing");
+ for (iterations = 0;iterations < 128 && !ent->priv.server->free;iterations++)
+ {
+ prog->globals.server->time = max(sv.time, ent->fields.server->nextthink);
+ ent->fields.server->nextthink = 0;
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
+ prog->globals.server->other = PRVM_EDICT_TO_PROG(prog->edicts);
+ PRVM_ExecuteProgram (ent->fields.server->think, "QC function self.think is missing");
+ // mods often set nextthink to time to cause a think every frame,
+ // we don't want to loop in that case, so exit if the new nextthink is
+ // <= the time the qc was told, also exit if it is past the end of the
+ // frame
+ if (ent->fields.server->nextthink <= prog->globals.server->time || ent->fields.server->nextthink > sv.time + sv.frametime || !sv_gameplayfix_multiplethinksperframe.integer)
+ break;
+ }
return !ent->priv.server->free;
}
==================
*/
extern void VM_SetTraceGlobals(const trace_t *trace);
+extern sizebuf_t vm_tempstringsbuf;
void SV_Impact (prvm_edict_t *e1, trace_t *trace)
{
+ int restorevm_tempstringsbuf_cursize;
int old_self, old_other;
prvm_edict_t *e2 = (prvm_edict_t *)trace->ent;
prvm_eval_t *val;
old_self = prog->globals.server->self;
old_other = prog->globals.server->other;
+ restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
VM_SetTraceGlobals(trace);
prog->globals.server->self = old_self;
prog->globals.server->other = old_other;
+ vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
}
1 = floor
2 = wall / step
4 = dead stop
+8 = teleported by touch method
If stepnormal is not NULL, the plane normal of any vertical wall hit will be stored
============
*/
+static float SV_Gravity (prvm_edict_t *ent);
+static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, qboolean dolink);
// LordHavoc: increased from 5 to 32
#define MAX_CLIP_PLANES 32
-int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsupercontentsmask)
+static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, float *stepnormal, int hitsupercontentsmask)
{
int blocked, bumpcount;
- int i, j, impact, numplanes;
- float d, time_left;
- vec3_t dir, end, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity;
+ int i, j, numplanes;
+ float d, time_left, gravity;
+ vec3_t dir, push, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity;
+#if 0
+ vec3_t end;
+#endif
trace_t trace;
if (time <= 0)
return 0;
+ gravity = 0;
+ if (applygravity)
+ {
+ if (sv_gameplayfix_gravityunaffectedbyticrate.integer)
+ {
+ gravity = SV_Gravity(ent) * 0.5f;
+ ent->fields.server->velocity[2] -= gravity;
+ }
+ else
+ {
+ applygravity = false;
+ ent->fields.server->velocity[2] -= SV_Gravity(ent);
+ }
+ }
blocked = 0;
VectorCopy(ent->fields.server->velocity, original_velocity);
VectorCopy(ent->fields.server->velocity, primal_velocity);
if (!ent->fields.server->velocity[0] && !ent->fields.server->velocity[1] && !ent->fields.server->velocity[2])
break;
- VectorMA(ent->fields.server->origin, time_left, ent->fields.server->velocity, end);
- trace = SV_Move(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
+ VectorScale(ent->fields.server->velocity, time_left, push);
+#if 0
+ VectorAdd(ent->fields.server->origin, push, end);
+#endif
+ trace = SV_PushEntity(ent, push, false, false); // the caller calls SV_LinkEntity on the own later
+
+ VectorCopy(trace.endpos, push); // convert to float for comparing
+ if(!VectorCompare(push, ent->fields.server->origin))
+ {
+ // we got teleported by a touch function
+ // let's abort the move
+ blocked |= 8;
+ break;
+ }
+
#if 0
//if (trace.fraction < 0.002)
{
}
#endif
- // break if it moved the entire distance
if (trace.fraction == 1)
- {
- VectorCopy(trace.endpos, ent->fields.server->origin);
break;
- }
-
- if (!trace.ent)
- {
- Con_Printf ("SV_FlyMove: !trace.ent");
- trace.ent = prog->edicts;
- }
-
- impact = !((int) ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent);
-
if (trace.plane.normal[2])
{
if (trace.plane.normal[2] > 0.7)
{
// floor
blocked |= 1;
+
+ if (!trace.ent)
+ {
+ Con_Printf ("SV_FlyMove: !trace.ent");
+ trace.ent = prog->edicts;
+ }
+
ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
}
if (stepnormal)
VectorCopy(trace.plane.normal, stepnormal);
}
-
if (trace.fraction >= 0.001)
{
// actually covered some distance
- VectorCopy(trace.endpos, ent->fields.server->origin);
VectorCopy(ent->fields.server->velocity, original_velocity);
numplanes = 0;
}
- // run the impact function
- if (impact)
- {
- SV_Impact(ent, &trace);
-
- // break if removed by the impact function
- if (ent->priv.server->free)
- break;
- }
-
time_left *= 1 - trace.fraction;
// clipped to another plane
*/
// LordHavoc: this came from QW and allows you to get out of water more easily
- if (sv_gameplayfix_qwplayerphysics.integer && ((int)ent->fields.server->flags & FL_WATERJUMP))
+ if (sv_gameplayfix_easierwaterjump.integer && ((int)ent->fields.server->flags & FL_WATERJUMP) && !(blocked & 8))
VectorCopy(primal_velocity, ent->fields.server->velocity);
+ if (applygravity && !((int)ent->fields.server->flags & FL_ONGROUND))
+ ent->fields.server->velocity[2] -= gravity;
return blocked;
}
/*
============
-SV_AddGravity
+SV_Gravity
============
*/
-void SV_AddGravity (prvm_edict_t *ent)
+static float SV_Gravity (prvm_edict_t *ent)
{
float ent_gravity;
prvm_eval_t *val;
ent_gravity = val->_float;
else
ent_gravity = 1.0;
- ent->fields.server->velocity[2] -= ent_gravity * sv_gravity.value * sv.frametime;
+ return ent_gravity * sv_gravity.value * sv.frametime;
}
Does not change the entities velocity at all
============
*/
-static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid)
+static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, qboolean dolink)
{
int type;
trace_t trace;
vec3_t end;
+ qboolean impact;
VectorAdd (ent->fields.server->origin, push, end);
return trace;
VectorCopy (trace.endpos, ent->fields.server->origin);
- SV_LinkEdict (ent, true);
- if (ent->fields.server->solid >= SOLID_TRIGGER && trace.ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent)))
+ impact = (ent->fields.server->solid >= SOLID_TRIGGER && trace.ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent)));
+
+ if(impact)
+ {
+ SV_LinkEdict (ent, dolink);
SV_Impact (ent, &trace);
+ }
+ else if(dolink)
+ SV_LinkEdict (ent, true);
+
return trace;
}
void SV_PushMove (prvm_edict_t *pusher, float movetime)
{
int i, e, index;
+ int pusherowner, pusherprog;
+ int checkcontents;
+ qboolean rotated;
float savesolid, movetime2, pushltime;
vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org;
int num_moved;
int numcheckentities;
static prvm_edict_t *checkentities[MAX_EDICTS];
- model_t *pushermodel;
+ dp_model_t *pushermodel;
trace_t trace;
matrix4x4_t pusherfinalmatrix, pusherfinalimatrix;
+ unsigned short moved_edicts[MAX_EDICTS];
if (!pusher->fields.server->velocity[0] && !pusher->fields.server->velocity[1] && !pusher->fields.server->velocity[2] && !pusher->fields.server->avelocity[0] && !pusher->fields.server->avelocity[1] && !pusher->fields.server->avelocity[2])
{
return;
}
pushermodel = sv.models[index];
+ pusherowner = pusher->fields.server->owner;
+ pusherprog = PRVM_EDICT_TO_PROG(pusher);
+
+ rotated = VectorLength2(pusher->fields.server->angles) + VectorLength2(pusher->fields.server->avelocity) > 0;
movetime2 = movetime;
VectorScale(pusher->fields.server->velocity, movetime2, move1);
|| check->fields.server->movetype == MOVETYPE_FAKEPUSH)
continue;
+ if (check->fields.server->owner == pusherprog)
+ continue;
+
+ if (pusherowner == PRVM_EDICT_TO_PROG(check))
+ continue;
+
+ //Con_Printf("%i %s ", PRVM_NUM_FOR_EDICT(check), PRVM_GetString(check->fields.server->classname));
+
+ // tell any MOVETYPE_STEP entity that it may need to check for water transitions
+ check->priv.server->waterposition_forceupdate = true;
+
+ checkcontents = SV_GenericHitSuperContentsMask(check);
+
// if the entity is standing on the pusher, it will definitely be moved
// if the entity is not standing on the pusher, but is in the pusher's
// final position, move it
if (!((int)check->fields.server->flags & FL_ONGROUND) || PRVM_PROG_TO_EDICT(check->fields.server->groundentity) != pusher)
{
- Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+ Collision_ClipToGenericEntity(&trace, pushermodel, (int) pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
+ //trace = SV_Move(check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, MOVE_NOMONSTERS, check, checkcontents);
if (!trace.startsolid)
+ {
+ //Con_Printf("- not in solid\n");
continue;
+ }
}
-
- if (forward[0] != 1 || left[1] != 1) // quick way to check if any rotation is used
+ if (rotated)
{
vec3_t org2;
VectorSubtract (check->fields.server->origin, pusher->fields.server->origin, org);
else
VectorCopy (move1, move);
+ //Con_Printf("- pushing %f %f %f\n", move[0], move[1], move[2]);
+
VectorCopy (check->fields.server->origin, check->priv.server->moved_from);
VectorCopy (check->fields.server->angles, check->priv.server->moved_fromangles);
- sv.moved_edicts[num_moved++] = check;
+ moved_edicts[num_moved++] = PRVM_NUM_FOR_EDICT(check);
// try moving the contacted entity
pusher->fields.server->solid = SOLID_NOT;
- trace = SV_PushEntity (check, move, true);
+ trace = SV_PushEntity (check, move, true, true);
// FIXME: turn players specially
check->fields.server->angles[1] += trace.fraction * moveangle[1];
pusher->fields.server->solid = savesolid; // was SOLID_BSP
//Con_Printf("%s:%d frac %f startsolid %d bmodelstartsolid %d allsolid %d\n", __FILE__, __LINE__, trace.fraction, trace.startsolid, trace.bmodelstartsolid, trace.allsolid);
- // this check is for items riding platforms that are passing under (or
- // through) walls intended to knock the items off
- if (trace.fraction < 1 && check->fields.server->movetype != MOVETYPE_WALK)
+ // this trace.fraction < 1 check causes items to fall off of pushers
+ // if they pass under or through a wall
+ // the groundentity check causes items to fall off of ledges
+ if (check->fields.server->movetype != MOVETYPE_WALK && (trace.fraction < 1 || PRVM_PROG_TO_EDICT(check->fields.server->groundentity) != pusher))
check->fields.server->flags = (int)check->fields.server->flags & ~FL_ONGROUND;
// if it is still inside the pusher, block
- Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+ Collision_ClipToGenericEntity(&trace, pushermodel, (int) pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
if (trace.startsolid)
{
// try moving the contacted entity a tiny bit further to account for precision errors
VectorScale(move, 1.1, move2);
VectorCopy (check->priv.server->moved_from, check->fields.server->origin);
VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
- SV_PushEntity (check, move2, true);
+ SV_PushEntity (check, move2, true, true);
pusher->fields.server->solid = savesolid;
- Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+ Collision_ClipToGenericEntity(&trace, pushermodel, (int) pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
if (trace.startsolid)
{
// try moving the contacted entity a tiny bit less to account for precision errors
VectorScale(move, 0.9, move2);
VectorCopy (check->priv.server->moved_from, check->fields.server->origin);
VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
- SV_PushEntity (check, move2, true);
+ SV_PushEntity (check, move2, true, true);
pusher->fields.server->solid = savesolid;
- Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+ Collision_ClipToGenericEntity(&trace, pushermodel, (int) pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
if (trace.startsolid)
{
// still inside pusher, so it's really blocked
// move back any entities we already moved
for (i = 0;i < num_moved;i++)
{
- prvm_edict_t *ed = sv.moved_edicts[i];
+ prvm_edict_t *ed = PRVM_EDICT_NUM(moved_edicts[i]);
VectorCopy (ed->priv.server->moved_from, ed->fields.server->origin);
VectorCopy (ed->priv.server->moved_fromangles, ed->fields.server->angles);
SV_LinkEdict (ed, false);
===============================================================================
*/
-/*
-=============
-SV_CheckStuck
+static float unstickoffsets[] =
+{
+ // poutting -/+z changes first as they are least weird
+ 0, 0, -1,
+ 0, 0, 1,
+ // x or y changes
+ -1, 0, 0,
+ 1, 0, 0,
+ 0, -1, 0,
+ 0, 1, 0,
+ // x and y changes
+ -1, -1, 0,
+ 1, -1, 0,
+ -1, 1, 0,
+ 1, 1, 0,
+};
+
+typedef enum unstickresult_e
+{
+ UNSTICK_STUCK = 0,
+ UNSTICK_GOOD = 1,
+ UNSTICK_UNSTUCK = 2
+}
+unstickresult_t;
-This is a big hack to try and fix the rare case of getting stuck in the world
-clipping hull.
-=============
-*/
-void SV_CheckStuck (prvm_edict_t *ent)
+unstickresult_t SV_UnstickEntityReturnOffset (prvm_edict_t *ent, vec3_t offset)
{
- int i, j, z;
- vec3_t org;
+ int i, maxunstick;
+
+ // if not stuck in a bmodel, just return
+ if (!SV_TestEntityPosition(ent, vec3_origin))
+ return UNSTICK_GOOD;
- if (!SV_TestEntityPosition(ent))
+ for (i = 0;i < (int)(sizeof(unstickoffsets) / sizeof(unstickoffsets[0]));i += 3)
{
- VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
- return;
+ if (!SV_TestEntityPosition(ent, unstickoffsets + i))
+ {
+ VectorCopy(unstickoffsets + i, offset);
+ SV_LinkEdict (ent, true);
+ return UNSTICK_UNSTUCK;
+ }
}
- VectorCopy (ent->fields.server->origin, org);
+ maxunstick = (int) ((ent->fields.server->maxs[2] - ent->fields.server->mins[2]) * 0.36);
+ // magic number 0.36 allows unsticking by up to 17 units with the largest supported bbox
- for (z=-1 ; z< 18 ; z++)
- for (i=-1 ; i <= 1 ; i++)
- for (j=-1 ; j <= 1 ; j++)
- {
- ent->fields.server->origin[0] = org[0] + i;
- ent->fields.server->origin[1] = org[1] + j;
- ent->fields.server->origin[2] = org[2] + z;
- if (!SV_TestEntityPosition(ent))
- {
- Con_DPrintf("Unstuck player entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), (float)i, (float)j, (float)z);
- SV_LinkEdict (ent, true);
- return;
- }
- }
-
- VectorCopy (ent->fields.server->oldorigin, ent->fields.server->origin);
- if (!SV_TestEntityPosition(ent))
+ for(i = 2; i <= maxunstick; ++i)
{
- Con_DPrintf("Unstuck player entity %i (classname \"%s\") by restoring oldorigin.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
- SV_LinkEdict (ent, true);
- return;
+ VectorClear(offset);
+ offset[2] = -i;
+ if (!SV_TestEntityPosition(ent, offset))
+ {
+ SV_LinkEdict (ent, true);
+ return UNSTICK_UNSTUCK;
+ }
+ offset[2] = i;
+ if (!SV_TestEntityPosition(ent, offset))
+ {
+ SV_LinkEdict (ent, true);
+ return UNSTICK_UNSTUCK;
+ }
}
- VectorCopy (org, ent->fields.server->origin);
- Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+ return UNSTICK_STUCK;
}
-static void SV_UnstickEntity (prvm_edict_t *ent)
+qboolean SV_UnstickEntity (prvm_edict_t *ent)
{
- int i, j, z;
- vec3_t org;
+ vec3_t offset;
+ switch(SV_UnstickEntityReturnOffset(ent, offset))
+ {
+ case UNSTICK_GOOD:
+ return true;
+ case UNSTICK_UNSTUCK:
+ Con_DPrintf("Unstuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), offset[0], offset[1], offset[2]);
+ return true;
+ case UNSTICK_STUCK:
+ if (developer.integer >= 100)
+ Con_Printf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+ return false;
+ default:
+ Con_Printf("SV_UnstickEntityReturnOffset returned a value outside its enum.\n");
+ return false;
+ }
+}
- // if not stuck in a bmodel, just return
- if (!SV_TestEntityPosition(ent))
- return;
+/*
+=============
+SV_CheckStuck
- VectorCopy (ent->fields.server->origin, org);
+This is a big hack to try and fix the rare case of getting stuck in the world
+clipping hull.
+=============
+*/
+void SV_CheckStuck (prvm_edict_t *ent)
+{
+ vec3_t offset;
- for (z=-1 ; z< 18 ; z += 6)
- for (i=-1 ; i <= 1 ; i++)
- for (j=-1 ; j <= 1 ; j++)
+ switch(SV_UnstickEntityReturnOffset(ent, offset))
+ {
+ case UNSTICK_GOOD:
+ VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
+ break;
+ case UNSTICK_UNSTUCK:
+ Con_DPrintf("Unstuck player entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), offset[0], offset[1], offset[2]);
+ break;
+ case UNSTICK_STUCK:
+ VectorSubtract(ent->fields.server->oldorigin, ent->fields.server->origin, offset);
+ if (!SV_TestEntityPosition(ent, offset))
{
- ent->fields.server->origin[0] = org[0] + i;
- ent->fields.server->origin[1] = org[1] + j;
- ent->fields.server->origin[2] = org[2] + z;
- if (!SV_TestEntityPosition(ent))
- {
- Con_DPrintf("Unstuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), (float)i, (float)j, (float)z);
- SV_LinkEdict (ent, true);
- return;
- }
+ Con_DPrintf("Unstuck player entity %i (classname \"%s\") by restoring oldorigin.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+ SV_LinkEdict (ent, true);
}
-
- VectorCopy (org, ent->fields.server->origin);
- if (developer.integer >= 100)
- Con_Printf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+ else
+ Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+ break;
+ default:
+ Con_Printf("SV_UnstickEntityReturnOffset returned a value outside its enum.\n");
+ }
}
case 7: dir[0] = -2; dir[1] = -2; break;
}
- SV_PushEntity (ent, dir, false);
+ SV_PushEntity (ent, dir, false, true);
// retry the original move
ent->fields.server->velocity[0] = oldvel[0];
int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity, hitsupercontentsmask;
vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity;
trace_t downtrace;
+ qboolean applygravity;
// if frametime is 0 (due to client sending the same timestamp twice),
// don't move
if (sv.frametime <= 0)
return;
+ SV_CheckStuck (ent);
+
+ applygravity = !SV_CheckWater (ent) && ent->fields.server->movetype == MOVETYPE_WALK && ! ((int)ent->fields.server->flags & FL_WATERJUMP);
+
hitsupercontentsmask = SV_GenericHitSuperContentsMask(ent);
SV_CheckVelocity(ent);
VectorCopy (ent->fields.server->origin, start_origin);
VectorCopy (ent->fields.server->velocity, start_velocity);
- clip = SV_FlyMove (ent, sv.frametime, NULL, hitsupercontentsmask);
+ clip = SV_FlyMove (ent, sv.frametime, applygravity, NULL, hitsupercontentsmask);
// if the move did not hit the ground at any point, we're not on ground
if (!(clip & 1))
ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
SV_CheckVelocity(ent);
+ SV_LinkEdict (ent, true);
- VectorCopy(ent->fields.server->origin, originalmove_origin);
- VectorCopy(ent->fields.server->velocity, originalmove_velocity);
- originalmove_clip = clip;
- originalmove_flags = (int)ent->fields.server->flags;
- originalmove_groundentity = ent->fields.server->groundentity;
+ if(clip & 8) // teleport
+ return;
if ((int)ent->fields.server->flags & FL_WATERJUMP)
return;
if (sv_nostep.integer)
return;
+ VectorCopy(ent->fields.server->origin, originalmove_origin);
+ VectorCopy(ent->fields.server->velocity, originalmove_velocity);
+ originalmove_clip = clip;
+ originalmove_flags = (int)ent->fields.server->flags;
+ originalmove_groundentity = ent->fields.server->groundentity;
+
// if move didn't block on a step, return
if (clip & 2)
{
// move up
VectorClear (upmove);
upmove[2] = sv_stepheight.value;
- // FIXME: don't link?
- SV_PushEntity(ent, upmove, false);
+ SV_PushEntity(ent, upmove, false, true);
// move forward
ent->fields.server->velocity[2] = 0;
- clip = SV_FlyMove (ent, sv.frametime, stepnormal, hitsupercontentsmask);
+ clip = SV_FlyMove (ent, sv.frametime, applygravity, stepnormal, hitsupercontentsmask);
ent->fields.server->velocity[2] += start_velocity[2];
SV_CheckVelocity(ent);
+ SV_LinkEdict (ent, true);
// check for stuckness, possibly due to the limited precision of floats
// in the clipping hulls
// move down
VectorClear (downmove);
downmove[2] = -sv_stepheight.value + start_velocity[2]*sv.frametime;
- // FIXME: don't link?
- downtrace = SV_PushEntity (ent, downmove, false);
+ downtrace = SV_PushEntity (ent, downmove, false, true);
if (downtrace.fraction < 1 && downtrace.plane.normal[2] > 0.7)
{
}
SV_CheckVelocity(ent);
+ SV_LinkEdict (ent, true);
}
//============================================================================
{
trace_t trace;
vec3_t move;
+ vec_t movetime;
+ int bump;
// if onground, return without moving
if ((int)ent->fields.server->flags & FL_ONGROUND)
// add gravity
if (ent->fields.server->movetype == MOVETYPE_TOSS || ent->fields.server->movetype == MOVETYPE_BOUNCE)
- SV_AddGravity (ent);
+ ent->fields.server->velocity[2] -= SV_Gravity(ent);
// move angles
VectorMA (ent->fields.server->angles, sv.frametime, ent->fields.server->avelocity, ent->fields.server->angles);
-// move origin
- VectorScale (ent->fields.server->velocity, sv.frametime, move);
- trace = SV_PushEntity (ent, move, true);
- if (ent->priv.server->free)
- return;
- if (trace.bmodelstartsolid)
+ movetime = sv.frametime;
+ for (bump = 0;bump < MAX_CLIP_PLANES && movetime > 0;bump++)
{
- // try to unstick the entity
- SV_UnstickEntity(ent);
- trace = SV_PushEntity (ent, move, false);
+ // move origin
+ VectorScale (ent->fields.server->velocity, movetime, move);
+ trace = SV_PushEntity (ent, move, true, true);
if (ent->priv.server->free)
return;
- }
-
- if (trace.fraction < 1)
- {
+ if (trace.bmodelstartsolid)
+ {
+ // try to unstick the entity
+ SV_UnstickEntity(ent);
+ trace = SV_PushEntity (ent, move, false, true);
+ if (ent->priv.server->free)
+ return;
+ }
+ if (trace.fraction == 1)
+ break;
+ movetime *= 1 - min(1, trace.fraction);
if (ent->fields.server->movetype == MOVETYPE_BOUNCEMISSILE)
{
ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 2.0);
}
else if (ent->fields.server->movetype == MOVETYPE_BOUNCE)
{
- float d;
- ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 1.5);
+ float d, ent_gravity;
+ prvm_eval_t *val;
+ float bouncefactor = 0.5f;
+ float bouncestop = 60.0f / 800.0f;
+
+ val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.bouncefactor);
+ if (val!=0 && val->_float)
+ bouncefactor = val->_float;
+
+ val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.bouncestop);
+ if (val!=0 && val->_float)
+ bouncestop = val->_float;
+
+ ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 1 + bouncefactor);
// LordHavoc: fixed grenades not bouncing when fired down a slope
+ val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.gravity);
+ if (val!=0 && val->_float)
+ ent_gravity = val->_float;
+ else
+ ent_gravity = 1.0;
if (sv_gameplayfix_grenadebouncedownslopes.integer)
{
d = DotProduct(trace.plane.normal, ent->fields.server->velocity);
- if (trace.plane.normal[2] > 0.7 && fabs(d) < 60)
+ if (trace.plane.normal[2] > 0.7 && fabs(d) < sv_gravity.value * bouncestop * ent_gravity)
{
ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
}
else
{
- if (trace.plane.normal[2] > 0.7 && ent->fields.server->velocity[2] < 60)
+ if (trace.plane.normal[2] > 0.7 && ent->fields.server->velocity[2] < sv_gravity.value * bouncestop * ent_gravity)
{
ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
else
ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
}
+ if (!sv_gameplayfix_slidemoveprojectiles.integer || (ent->fields.server->movetype != MOVETYPE_BOUNCE && ent->fields.server->movetype == MOVETYPE_BOUNCEMISSILE) || ((int)ent->fields.server->flags & FL_ONGROUND))
+ break;
}
// check for in water
void SV_Physics_Step (prvm_edict_t *ent)
{
int flags = (int)ent->fields.server->flags;
+
+ // DRESK
+ // Backup Velocity in the event that movetypesteplandevent is called,
+ // to provide a parameter with the entity's velocity at impact.
+ prvm_eval_t *movetypesteplandevent;
+ vec3_t backupVelocity;
+ VectorCopy(ent->fields.server->velocity, backupVelocity);
// don't fall at all if fly/swim
if (!(flags & (FL_FLY | FL_SWIM)))
{
if ((ent->fields.server->velocity[2] >= (1.0 / 32.0) && sv_gameplayfix_upwardvelocityclearsongroundflag.integer) || ent->fields.server->groundentity)
{
ent->fields.server->flags -= FL_ONGROUND;
- SV_AddGravity(ent);
SV_CheckVelocity(ent);
- SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
+ SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent));
SV_LinkEdict(ent, true);
+ ent->priv.server->waterposition_forceupdate = true;
}
}
else
// freefall if not onground
int hitsound = ent->fields.server->velocity[2] < sv_gravity.value * -0.1;
- SV_AddGravity(ent);
SV_CheckVelocity(ent);
- SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
+ SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent));
SV_LinkEdict(ent, true);
// just hit ground
- if (hitsound && (int)ent->fields.server->flags & FL_ONGROUND && sv_sound_land.string)
- SV_StartSound(ent, 0, sv_sound_land.string, 255, 1);
+ if (hitsound && (int)ent->fields.server->flags & FL_ONGROUND)
+ {
+ // DRESK - Check for Entity Land Event Function
+ movetypesteplandevent = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.movetypesteplandevent);
+
+ if(movetypesteplandevent->function)
+ { // Valid Function; Execute
+ // Prepare Parameters
+ // Assign Velocity at Impact
+ PRVM_G_VECTOR(OFS_PARM0)[0] = backupVelocity[0];
+ PRVM_G_VECTOR(OFS_PARM0)[1] = backupVelocity[1];
+ PRVM_G_VECTOR(OFS_PARM0)[2] = backupVelocity[2];
+ // Assign Self
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
+ // Execute VM Function
+ PRVM_ExecuteProgram(movetypesteplandevent->function, "movetypesteplandevent: NULL function");
+ }
+ else
+ // Check for Engine Landing Sound
+ if(sv_sound_land.string)
+ SV_StartSound(ent, 0, sv_sound_land.string, 255, 1);
+ }
+ ent->priv.server->waterposition_forceupdate = true;
}
}
// regular thinking
- SV_RunThink(ent);
+ if (!SV_RunThink(ent))
+ return;
- SV_CheckWaterTransition(ent);
+ if (ent->priv.server->waterposition_forceupdate || !VectorCompare(ent->fields.server->origin, ent->priv.server->waterposition_origin))
+ {
+ ent->priv.server->waterposition_forceupdate = false;
+ VectorCopy(ent->fields.server->origin, ent->priv.server->waterposition_origin);
+ SV_CheckWaterTransition(ent);
+ }
}
//============================================================================
static void SV_Physics_Entity (prvm_edict_t *ent)
{
- // don't run a move on newly spawned projectiles as it messes up movement
- // interpolation and rocket trails
+ // don't run think/move on newly spawned projectiles as it messes up
+ // movement interpolation and rocket trails, and is inconsistent with
+ // respect to entities spawned in the same frame
+ // (if an ent spawns a higher numbered ent, it moves in the same frame,
+ // but if it spawns a lower numbered ent, it doesn't - this never moves
+ // ents in the first frame regardless)
qboolean runmove = ent->priv.server->move;
ent->priv.server->move = true;
+ if (!runmove && sv_gameplayfix_delayprojectiles.integer)
+ return;
switch ((int) ent->fields.server->movetype)
{
case MOVETYPE_PUSH:
break;
case MOVETYPE_WALK:
if (SV_RunThink (ent))
- {
- if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
- SV_AddGravity (ent);
- SV_CheckStuck (ent);
SV_WalkMove (ent);
- SV_LinkEdict (ent, true);
- }
break;
case MOVETYPE_TOSS:
case MOVETYPE_BOUNCE:
case MOVETYPE_FLYMISSILE:
case MOVETYPE_FLY:
// regular thinking
- if (SV_RunThink (ent) && runmove)
+ if (SV_RunThink (ent))
SV_Physics_Toss (ent);
break;
default:
prvm_edict_t *ent;
ent = host_client->edict;
- // call player physics
+ // call player physics, this needs the proper frametime
+ prog->globals.server->frametime = sv.frametime;
SV_ClientThink();
- // call standard client pre-think
+ // call standard client pre-think, with frametime = 0
prog->globals.server->time = sv.time;
+ prog->globals.server->frametime = 0;
prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
PRVM_ExecuteProgram (prog->globals.server->PlayerPreThink, "QC function PlayerPreThink is missing");
+ prog->globals.server->frametime = sv.frametime;
// make sure the velocity is sane (not a NaN)
SV_CheckVelocity(ent);
VectorClear(ent->fields.server->velocity);
// perform MOVETYPE_WALK behavior
- if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
- SV_AddGravity (ent);
- SV_CheckStuck (ent);
SV_WalkMove (ent);
- SV_CheckVelocity (ent);
-
- SV_LinkEdict (ent, true);
-
- SV_CheckVelocity (ent);
-
- // call standard player post-think
+ // call standard player post-think, with frametime = 0
prog->globals.server->time = sv.time;
+ prog->globals.server->frametime = 0;
prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
PRVM_ExecuteProgram (prog->globals.server->PlayerPostThink, "QC function PlayerPostThink is missing");
+ prog->globals.server->frametime = sv.frametime;
if(ent->fields.server->fixangle)
{
}
// don't run physics here if running asynchronously
- if (host_client->clmovement_skipphysicsframes <= 0)
+ if (host_client->clmovement_inputtimeout <= 0)
+ {
SV_ClientThink();
+ //host_client->cmd.time = max(host_client->cmd.time, sv.time);
+ }
// make sure the velocity is sane (not a NaN)
SV_CheckVelocity(ent);
case MOVETYPE_WALK:
SV_RunThink (ent);
// don't run physics here if running asynchronously
- if (host_client->clmovement_skipphysicsframes <= 0)
- {
- if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
- SV_AddGravity (ent);
- SV_CheckStuck (ent);
+ if (host_client->clmovement_inputtimeout <= 0)
SV_WalkMove (ent);
- }
break;
case MOVETYPE_TOSS:
case MOVETYPE_BOUNCE:
break;
case MOVETYPE_FLY:
SV_RunThink (ent);
- SV_CheckWater (ent);
SV_WalkMove (ent);
break;
default:
// decrement the countdown variable used to decide when to go back to
// synchronous physics
- if (host_client->clmovement_skipphysicsframes > 0)
- host_client->clmovement_skipphysicsframes--;
+ if (host_client->clmovement_inputtimeout > sv.frametime)
+ host_client->clmovement_inputtimeout -= sv.frametime;
+ else
+ host_client->clmovement_inputtimeout = 0;
SV_CheckVelocity (ent);
}
// decrement prog->num_edicts if the highest number entities died
- for (;PRVM_EDICT_NUM(prog->num_edicts - 1)->priv.server->free;prog->num_edicts--);
+ for (;PRVM_ED_CanAlloc(PRVM_EDICT_NUM(prog->num_edicts - 1));prog->num_edicts--);
if (!sv_freezenonclients.integer)
sv.time += sv.frametime;
projects / xonotic / darkplaces.git / blobdiff