// 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);
}
// 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;
unsigned int modelindex;
int frame;
// list of entities to test for collisions
*/
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;
}
// 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;
}
If stepnormal is not NULL, the plane normal of any vertical wall hit will be stored
============
*/
+static float SV_Gravity (prvm_edict_t *ent);
// 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;
+ float d, time_left, gravity;
vec3_t dir, end, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity;
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);
// LordHavoc: this came from QW and allows you to get out of water more easily
if (sv_gameplayfix_easierwaterjump.integer && ((int)ent->fields.server->flags & FL_WATERJUMP))
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;
}
void SV_PushMove (prvm_edict_t *pusher, float movetime)
{
int i, e, index;
+ int pusherowner, pusherprog;
int checkcontents;
qboolean rotated;
float savesolid, movetime2, pushltime;
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];
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;
|| 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
// 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, checkcontents);
+ 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)
{
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, checkcontents);
+ 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
VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
SV_PushEntity (check, move2, 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, checkcontents);
+ 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
VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
SV_PushEntity (check, move2, 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, checkcontents);
+ 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
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,
- 0, 0, -1,
- 0, 0, 1,
- 0, 0, -2,
- 0, 0, 2,
- 0, 0, -3,
- 0, 0, 3,
- 0, 0, -4,
- 0, 0, 4,
- 0, 0, -5,
- 0, 0, 5,
- 0, 0, -6,
- 0, 0, 6,
- 0, 0, -7,
- 0, 0, 7,
- 0, 0, -8,
- 0, 0, 8,
- 0, 0, -9,
- 0, 0, 9,
- 0, 0, -10,
- 0, 0, 10,
- 0, 0, -11,
- 0, 0, 11,
- 0, 0, -12,
- 0, 0, 12,
- 0, 0, -13,
- 0, 0, 13,
- 0, 0, -14,
- 0, 0, 14,
- 0, 0, -15,
- 0, 0, 15,
- 0, 0, -16,
- 0, 0, 16,
- 0, 0, -17,
- 0, 0, 17,
};
-/*
-=============
-SV_CheckStuck
+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;
- vec3_t offset;
+ int i, maxunstick;
+ // if not stuck in a bmodel, just return
if (!SV_TestEntityPosition(ent, vec3_origin))
- {
- VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
- return;
- }
+ return UNSTICK_GOOD;
for (i = 0;i < (int)(sizeof(unstickoffsets) / sizeof(unstickoffsets[0]));i += 3)
{
if (!SV_TestEntityPosition(ent, unstickoffsets + i))
{
- 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), unstickoffsets[i+0], unstickoffsets[i+1], unstickoffsets[i+2]);
+ VectorCopy(unstickoffsets + i, offset);
SV_LinkEdict (ent, true);
- return;
+ return UNSTICK_UNSTUCK;
}
}
- VectorSubtract(ent->fields.server->oldorigin, ent->fields.server->origin, offset);
- if (!SV_TestEntityPosition(ent, offset))
+ 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(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;
+ }
}
- Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+ return UNSTICK_STUCK;
}
qboolean SV_UnstickEntity (prvm_edict_t *ent)
{
- int i;
-
- // if not stuck in a bmodel, just return
- if (!SV_TestEntityPosition(ent, vec3_origin))
- return true;
-
- for (i = 0;i < (int)(sizeof(unstickoffsets) / sizeof(unstickoffsets[0]));i += 3)
+ vec3_t offset;
+ switch(SV_UnstickEntityReturnOffset(ent, offset))
{
- if (!SV_TestEntityPosition(ent, unstickoffsets + i))
- {
- 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), unstickoffsets[i+0], unstickoffsets[i+1], unstickoffsets[i+2]);
- SV_LinkEdict (ent, true);
+ 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 (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;
+/*
+=============
+SV_CheckStuck
+
+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;
+
+ 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))
+ {
+ 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);
+ }
+ 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");
+ }
}
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);
// 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
}
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);
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);
+ 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
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;
}
// 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
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 || !sv_gameplayfix_delayprojectiles.integer))
+ if (SV_RunThink (ent))
SV_Physics_Toss (ent);
break;
default:
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, with frametime = 0
prog->globals.server->time = sv.time;
prog->globals.server->frametime = 0;
}
// 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