X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_phys.c;h=628591e23ec569a575412974df229e04a44b1052;hp=f79b104d52bccb5c41bdcc2a4550f8a425278cc3;hb=0dab13d8227daa31cf55e80977cef0397e7357c6;hpb=ded1118040e7d6a4a7def619a550e458428ba94e diff --git a/sv_phys.c b/sv_phys.c index f79b104d..628591e2 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -48,6 +48,7 @@ cvar_t sv_stepheight = {CVAR_NOTIFY, "sv_stepheight", "18"}; cvar_t sv_jumpstep = {CVAR_NOTIFY, "sv_jumpstep", "1"}; cvar_t sv_wallfriction = {CVAR_NOTIFY, "sv_wallfriction", "1"}; cvar_t sv_newflymove = {CVAR_NOTIFY, "sv_newflymove", "1"}; +cvar_t sv_freezenonclients = {CVAR_NOTIFY, "sv_freezenonclients", "0"}; #define MOVE_EPSILON 0.01 @@ -59,6 +60,7 @@ void SV_Phys_Init (void) Cvar_RegisterVariable(&sv_jumpstep); Cvar_RegisterVariable(&sv_wallfriction); Cvar_RegisterVariable(&sv_newflymove); + Cvar_RegisterVariable(&sv_freezenonclients); } /* @@ -84,7 +86,7 @@ void SV_CheckAllEnts (void) continue; if (SV_TestEntityPosition (check)) - Con_Printf ("entity in invalid position\n"); + Con_Print("entity in invalid position\n"); } } @@ -105,12 +107,12 @@ void SV_CheckVelocity (edict_t *ent) { if (IS_NAN(ent->v->velocity[i])) { - Con_Printf ("Got a NaN velocity on %s\n", PR_GetString(ent->v->classname)); + Con_Printf("Got a NaN velocity on %s\n", PR_GetString(ent->v->classname)); ent->v->velocity[i] = 0; } if (IS_NAN(ent->v->origin[i])) { - Con_Printf ("Got a NaN origin on %s\n", PR_GetString(ent->v->classname)); + Con_Printf("Got a NaN origin on %s\n", PR_GetString(ent->v->classname)); ent->v->origin[i] = 0; } } @@ -230,204 +232,185 @@ If stepnormal is not NULL, the plane normal of any vertical wall hit will be sto #define MAX_CLIP_PLANES 20 int SV_FlyMove (edict_t *ent, float time, float *stepnormal) { - if (sv_newflymove.integer) + int blocked, bumpcount; + edict_t *hackongroundentity; + int i, j, impact, numplanes; + float d, time_left; + vec3_t dir, end, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity; + trace_t trace; + blocked = 0; + VectorCopy(ent->v->velocity, original_velocity); + VectorCopy(ent->v->velocity, primal_velocity); + numplanes = 0; + time_left = time; + hackongroundentity = NULL; + for (bumpcount = 0;bumpcount < 8;bumpcount++) { - int blocked, impact, bumpcount; - vec3_t end, primal_velocity; - trace_t trace; - - blocked = 0; - VectorCopy (ent->v->velocity, primal_velocity); + if (!ent->v->velocity[0] && !ent->v->velocity[1] && !ent->v->velocity[2]) + break; - for (bumpcount = 0;bumpcount < 4;bumpcount++) + VectorMA(ent->v->origin, time_left, ent->v->velocity, end); + trace = SV_Move(ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent); +#if 0 + //if (trace.fraction < 0.002) { - if (!ent->v->velocity[0] && !ent->v->velocity[1] && !ent->v->velocity[2]) - break; - - VectorMA(ent->v->origin, time, ent->v->velocity, end); - trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent); - //Con_Printf("trace %f %f %f : %f : %f %f %f\n", trace.endpos[0], trace.endpos[1], trace.endpos[2], trace.fraction, trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]); - - if (trace.allsolid) +#if 1 + vec3_t start; + trace_t testtrace; + VectorCopy(ent->v->origin, start); + start[2] += 3;//0.03125; + VectorMA(ent->v->origin, time_left, ent->v->velocity, end); + end[2] += 3;//0.03125; + testtrace = SV_Move(start, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent); + if (trace.fraction < testtrace.fraction && !testtrace.startsolid && (testtrace.fraction == 1 || DotProduct(trace.plane.normal, ent->v->velocity) < DotProduct(testtrace.plane.normal, ent->v->velocity))) { - // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world) - // entity is trapped in another solid - VectorClear(ent->v->velocity); - return 3; + Con_Printf("got further (new %f > old %f)\n", testtrace.fraction, trace.fraction); + trace = testtrace; } - - if (trace.fraction > 0) - { - // actually covered some distance - VectorCopy (trace.endpos, ent->v->origin); - } - - // break if it moved the entire distance - if (trace.fraction == 1) - break; - - if (!trace.ent) - Host_Error ("SV_FlyMove: !trace.ent"); - - if ((int) ent->v->flags & FL_ONGROUND) +#endif +#if 0 + //j = -1; + for (i = 0;i < numplanes;i++) { - if (ent->v->groundentity == EDICT_TO_PROG(trace.ent)) - impact = false; - else + VectorCopy(ent->v->origin, start); + VectorMA(ent->v->origin, time_left, ent->v->velocity, end); + VectorMA(start, 3, planes[i], start); + VectorMA(end, 3, planes[i], end); + testtrace = SV_Move(start, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent); + if (trace.fraction < testtrace.fraction) { - ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND; - impact = true; + trace = testtrace; + VectorCopy(start, ent->v->origin); + //j = i; } } - else - impact = true; - - if (trace.plane.normal[2] > 0.7) - { - // floor - blocked |= 1; - ent->v->flags = (int)ent->v->flags | FL_ONGROUND; - ent->v->groundentity = EDICT_TO_PROG(trace.ent); - } - if (!trace.plane.normal[2]) - { - // step - blocked |= 2; - // save the trace for player extrafriction - if (stepnormal) - VectorCopy(trace.plane.normal, stepnormal); - } - - // run the impact function - if (impact) - { - SV_Impact (ent, trace.ent); - - // break if removed by the impact function - if (ent->e->free) - break; - } - - time *= 1 - trace.fraction; - - ClipVelocity (ent->v->velocity, trace.plane.normal, ent->v->velocity, 1); + //if (j >= 0) + // VectorAdd(ent->v->origin, planes[j], start); +#endif } +#endif - return blocked; - } - else - { - int i, j, blocked, impact, numplanes, bumpcount, numbumps; - float d, time_left; - vec3_t dir, end, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity; - trace_t trace; - - numbumps = 4; +#if 0 + Con_Printf("entity %i bump %i: velocity %f %f %f trace %f", ent - sv.edicts, bumpcount, ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2], trace.fraction); + if (trace.fraction < 1) + Con_Printf(" : %f %f %f", trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]); + Con_Print("\n"); +#endif - blocked = 0; - VectorCopy (ent->v->velocity, original_velocity); - VectorCopy (ent->v->velocity, primal_velocity); - numplanes = 0; - - time_left = time; - - for (bumpcount=0 ; bumpcountv->velocity[0] && !ent->v->velocity[1] && !ent->v->velocity[2]) - break; - - for (i=0 ; i<3 ; i++) - end[i] = ent->v->origin[i] + time_left * ent->v->velocity[i]; - - trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent); - - if (trace.allsolid) - { - // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world) - // entity is trapped in another solid - VectorClear(ent->v->velocity); - return 3; - } - - if (trace.fraction > 0) - { - // actually covered some distance - VectorCopy (trace.endpos, ent->v->origin); - VectorCopy (ent->v->velocity, original_velocity); - numplanes = 0; - } + // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world) + // entity is trapped in another solid + VectorClear(ent->v->velocity); + return 3; + } + */ - // break if it moved the entire distance - if (trace.fraction == 1) - break; + // break if it moved the entire distance + if (trace.fraction == 1) + { + VectorCopy(trace.endpos, ent->v->origin); + break; + } - if (!trace.ent) - Host_Error ("SV_FlyMove: !trace.ent"); + if (!trace.ent) + Host_Error("SV_FlyMove: !trace.ent"); - if ((int) ent->v->flags & FL_ONGROUND) - { - if (ent->v->groundentity == EDICT_TO_PROG(trace.ent)) - impact = false; - else - { - ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND; - impact = true; - } - } + if ((int) ent->v->flags & FL_ONGROUND) + { + if (ent->v->groundentity == EDICT_TO_PROG(trace.ent)) + impact = false; else + { + ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND; impact = true; + } + } + else + impact = true; + if (trace.plane.normal[2]) + { if (trace.plane.normal[2] > 0.7) { // floor blocked |= 1; - ent->v->flags = (int)ent->v->flags | FL_ONGROUND; + ent->v->flags = (int)ent->v->flags | FL_ONGROUND; ent->v->groundentity = EDICT_TO_PROG(trace.ent); } - if (!trace.plane.normal[2]) - { - // step - blocked |= 2; - // save the trace for player extrafriction - if (stepnormal) - VectorCopy(trace.plane.normal, stepnormal); - } + else if (trace.fraction < 0.001) + hackongroundentity = trace.ent; + } + else + { + // step + blocked |= 2; + // save the trace for player extrafriction + if (stepnormal) + VectorCopy(trace.plane.normal, stepnormal); + } - // run the impact function - if (impact) - { - SV_Impact (ent, trace.ent); + if (trace.fraction >= 0.001) + { + // actually covered some distance + VectorCopy(trace.endpos, ent->v->origin); + VectorCopy(ent->v->velocity, original_velocity); + numplanes = 0; + } - // break if removed by the impact function - if (ent->e->free) - break; - } + // run the impact function + if (impact) + { + SV_Impact(ent, trace.ent); + // break if removed by the impact function + if (ent->e->free) + break; + } - time_left -= time_left * trace.fraction; + time_left *= 1 - trace.fraction; - // clipped to another plane - if (numplanes >= MAX_CLIP_PLANES) - { - // this shouldn't really happen - VectorClear(ent->v->velocity); - return 3; - } + // clipped to another plane + if (numplanes >= MAX_CLIP_PLANES) + { + // this shouldn't really happen + VectorClear(ent->v->velocity); + blocked = 3; + break; + } - VectorCopy (trace.plane.normal, planes[numplanes]); - numplanes++; + /* + for (i = 0;i < numplanes;i++) + if (DotProduct(trace.plane.normal, planes[i]) > 0.99) + break; + if (i < numplanes) + { + VectorAdd(ent->v->velocity, trace.plane.normal, ent->v->velocity); + continue; + } + */ + VectorCopy(trace.plane.normal, planes[numplanes]); + numplanes++; + + if (sv_newflymove.integer) + ClipVelocity(ent->v->velocity, trace.plane.normal, ent->v->velocity, 1); + else + { // modify original_velocity so it parallels all of the clip planes - for (i=0 ; iv->velocity); + VectorCopy(new_velocity, ent->v->velocity); } else { @@ -443,26 +426,49 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal) if (numplanes != 2) { VectorClear(ent->v->velocity); - return 7; + blocked = 7; + break; } - CrossProduct (planes[0], planes[1], dir); + CrossProduct(planes[0], planes[1], dir); // LordHavoc: thanks to taniwha of QuakeForge for pointing out this fix for slowed falling in corners VectorNormalize(dir); - d = DotProduct (dir, ent->v->velocity); - VectorScale (dir, d, ent->v->velocity); + d = DotProduct(dir, ent->v->velocity); + VectorScale(dir, d, ent->v->velocity); } + } - // if original velocity is against the original velocity, - // stop dead to avoid tiny occilations in sloping corners - if (DotProduct (ent->v->velocity, primal_velocity) <= 0) - { - VectorClear(ent->v->velocity); - return blocked; - } + // if original velocity is against the original velocity, + // stop dead to avoid tiny occilations in sloping corners + if (DotProduct(ent->v->velocity, primal_velocity) <= 0) + { + VectorClear(ent->v->velocity); + break; } + } + + //Con_Printf("entity %i final: blocked %i velocity %f %f %f\n", ent - sv.edicts, blocked, ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]); - return blocked; + /* + // FIXME: this doesn't work well at all, find another solution + // if player is ontop of a non-onground floor and made no progress, + // set onground anyway (this tends to happen if standing in a wedge) + if (bumpcount == 8 && hackongroundentity) + { + blocked |= 1; + ent->v->flags = (int)ent->v->flags | FL_ONGROUND; + ent->v->groundentity = EDICT_TO_PROG(hackongroundentity); + } + */ + + /* + if ((blocked & 1) == 0 && bumpcount > 1) + { + // LordHavoc: fix the 'fall to your death in a wedge corner' glitch + // flag ONGROUND if there's ground under it + trace = SV_Move(ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent); } + */ + return blocked; } @@ -542,7 +548,12 @@ void SV_PushMove (edict_t *pusher, float movetime) vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org, org2; int num_moved; model_t *pushermodel; - trace_t trace; + + if (!pusher->v->velocity[0] && !pusher->v->velocity[1] && !pusher->v->velocity[2] && !pusher->v->avelocity[0] && !pusher->v->avelocity[1] && !pusher->v->avelocity[2]) + { + pusher->v->ltime += movetime; + return; + } switch ((int) pusher->v->solid) { @@ -557,17 +568,15 @@ void SV_PushMove (edict_t *pusher, float movetime) case SOLID_TRIGGER: VectorMA (pusher->v->origin, movetime, pusher->v->velocity, pusher->v->origin); VectorMA (pusher->v->angles, movetime, pusher->v->avelocity, pusher->v->angles); + pusher->v->angles[0] -= 360.0 * floor(pusher->v->angles[0] * (1.0 / 360.0)); + pusher->v->angles[1] -= 360.0 * floor(pusher->v->angles[1] * (1.0 / 360.0)); + pusher->v->angles[2] -= 360.0 * floor(pusher->v->angles[2] * (1.0 / 360.0)); pusher->v->ltime += movetime; SV_LinkEdict (pusher, false); return; default: Host_Error("SV_PushMove: unrecognized solid type %f\n", pusher->v->solid); } - if (!pusher->v->velocity[0] && !pusher->v->velocity[1] && !pusher->v->velocity[2] && !pusher->v->avelocity[0] && !pusher->v->avelocity[1] && !pusher->v->avelocity[2]) - { - pusher->v->ltime += movetime; - return; - } index = (int) pusher->v->modelindex; if (index < 1 || index >= MAX_MODELS) Host_Error("SV_PushMove: invalid modelindex %f\n", pusher->v->modelindex); @@ -651,7 +660,8 @@ void SV_PushMove (edict_t *pusher, float movetime) if (check->v->movetype == MOVETYPE_PUSH || check->v->movetype == MOVETYPE_NONE || check->v->movetype == MOVETYPE_FOLLOW - || check->v->movetype == MOVETYPE_NOCLIP) + || check->v->movetype == MOVETYPE_NOCLIP + || check->v->movetype == MOVETYPE_FAKEPUSH) continue; // if the entity is standing on the pusher, it will definitely be moved @@ -665,12 +675,11 @@ void SV_PushMove (edict_t *pusher, float movetime) || check->v->absmax[2] <= mins[2]) continue; - trace = SV_ClipMoveToEntity (pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin); - if (!trace.startsolid) + if (!SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid) continue; } - if (forward[0] < 0.999f) // quick way to check if any rotation is used + if (forward[0] != 1) // quick way to check if any rotation is used { VectorSubtract (check->v->origin, pusher->v->origin, org); org2[0] = DotProduct (org, forward); @@ -692,18 +701,18 @@ void SV_PushMove (edict_t *pusher, float movetime) // try moving the contacted entity pusher->v->solid = SOLID_NOT; - trace = SV_PushEntity (check, move, moveangle); + SV_PushEntity (check, move, moveangle); pusher->v->solid = savesolid; // was SOLID_BSP // if it is still inside the pusher, block - if (SV_TestEntityPosition (check)) + if (SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid) { // try moving the contacted entity a tiny bit further to account for precision errors pusher->v->solid = SOLID_NOT; VectorScale(move, 0.1, move); - trace = SV_PushEntity (check, move, vec3_origin); + SV_PushEntity (check, move, vec3_origin); pusher->v->solid = savesolid; - if (SV_TestEntityPosition (check)) + if (SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid) { // still inside pusher, so it's really blocked @@ -739,10 +748,13 @@ void SV_PushMove (edict_t *pusher, float movetime) pr_global_struct->other = EDICT_TO_PROG(check); PR_ExecuteProgram (pusher->v->blocked, ""); } - return; + break; } } } + pusher->v->angles[0] -= 360.0 * floor(pusher->v->angles[0] * (1.0 / 360.0)); + pusher->v->angles[1] -= 360.0 * floor(pusher->v->angles[1] * (1.0 / 360.0)); + pusher->v->angles[2] -= 360.0 * floor(pusher->v->angles[2] * (1.0 / 360.0)); } /* @@ -778,10 +790,7 @@ void SV_Physics_Pusher (edict_t *ent) pr_global_struct->self = EDICT_TO_PROG(ent); pr_global_struct->other = EDICT_TO_PROG(sv.edicts); PR_ExecuteProgram (ent->v->think, "NULL think function"); - if (ent->e->free) - return; } - } @@ -816,7 +825,7 @@ void SV_CheckStuck (edict_t *ent) VectorCopy (ent->v->oldorigin, ent->v->origin); if (!SV_TestEntityPosition(ent)) { - Con_DPrintf ("Unstuck.\n"); + Con_DPrint("Unstuck.\n"); SV_LinkEdict (ent, true); return; } @@ -830,14 +839,14 @@ void SV_CheckStuck (edict_t *ent) ent->v->origin[2] = org[2] + z; if (!SV_TestEntityPosition(ent)) { - Con_DPrintf ("Unstuck.\n"); + Con_DPrint("Unstuck.\n"); SV_LinkEdict (ent, true); return; } } VectorCopy (org, ent->v->origin); - Con_DPrintf ("player is stuck.\n"); + Con_DPrint("player is stuck.\n"); } @@ -857,18 +866,18 @@ qboolean SV_CheckWater (edict_t *ent) ent->v->waterlevel = 0; ent->v->watertype = CONTENTS_EMPTY; - cont = Mod_PointContents(point, sv.worldmodel); + cont = SV_PointQ1Contents(point); if (cont <= CONTENTS_WATER) { ent->v->watertype = cont; ent->v->waterlevel = 1; point[2] = ent->v->origin[2] + (ent->v->mins[2] + ent->v->maxs[2])*0.5; - cont = Mod_PointContents(point, sv.worldmodel); + cont = SV_PointQ1Contents(point); if (cont <= CONTENTS_WATER) { ent->v->waterlevel = 2; point[2] = ent->v->origin[2] + ent->v->view_ofs[2]; - cont = Mod_PointContents(point, sv.worldmodel); + cont = SV_PointQ1Contents(point); if (cont <= CONTENTS_WATER) ent->v->waterlevel = 3; } @@ -889,19 +898,15 @@ void SV_WallFriction (edict_t *ent, float *stepnormal) vec3_t forward, into, side; AngleVectors (ent->v->v_angle, forward, NULL, NULL); - d = DotProduct (stepnormal, forward); - - d += 0.5; - if (d >= 0) - return; - - // cut the tangential velocity - i = DotProduct (stepnormal, ent->v->velocity); - VectorScale (stepnormal, i, into); - VectorSubtract (ent->v->velocity, into, side); - - ent->v->velocity[0] = side[0] * (1 + d); - ent->v->velocity[1] = side[1] * (1 + d); + if ((d = DotProduct (stepnormal, forward) + 0.5) < 0) + { + // cut the tangential velocity + i = DotProduct (stepnormal, ent->v->velocity); + VectorScale (stepnormal, i, into); + VectorSubtract (ent->v->velocity, into, side); + ent->v->velocity[0] = side[0] * (1 + d); + ent->v->velocity[1] = side[1] * (1 + d); + } } /* @@ -949,7 +954,10 @@ int SV_TryUnstick (edict_t *ent, vec3_t oldvel) if (fabs(oldorg[1] - ent->v->origin[1]) > 4 || fabs(oldorg[0] - ent->v->origin[0]) > 4) + { + Con_DPrint("TryUnstick - success.\n"); return clip; + } // go back to the original pos and try again VectorCopy (oldorg, ent->v->origin); @@ -957,6 +965,7 @@ int SV_TryUnstick (edict_t *ent, vec3_t oldvel) // still not moving VectorClear (ent->v->velocity); + Con_DPrint("TryUnstick - failure.\n"); return 7; } @@ -969,10 +978,12 @@ Only used by players */ void SV_WalkMove (edict_t *ent) { - int clip, oldonground; - vec3_t upmove, downmove, oldorg, oldvel, nosteporg, nostepvel, stepnormal; + int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity; + vec3_t upmove, downmove, oldorg, oldvel, nosteporg, nostepvel, stepnormal, originalmove_origin, originalmove_velocity; trace_t downtrace; + SV_CheckVelocity(ent); + // do a regular slide move unless it looks like you ran into a step oldonground = (int)ent->v->flags & FL_ONGROUND; ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND; @@ -981,11 +992,22 @@ void SV_WalkMove (edict_t *ent) VectorCopy (ent->v->velocity, oldvel); clip = SV_FlyMove (ent, sv.frametime, NULL); + VectorCopy(ent->v->origin, originalmove_origin); + VectorCopy(ent->v->velocity, originalmove_velocity); + originalmove_clip = clip; + originalmove_flags = (int)ent->v->flags; + originalmove_groundentity = ent->v->groundentity; + + SV_CheckVelocity(ent); // if move didn't block on a step, return if ( !(clip & 2) ) return; + // if move was not trying to move into the step, return + if (fabs(oldvel[0]) < 0.03125 && fabs(oldvel[1]) < 0.03125) + return; + if (ent->v->movetype != MOVETYPE_FLY) { if (!oldonground && ent->v->waterlevel == 0 && !sv_jumpstep.integer) @@ -997,10 +1019,9 @@ void SV_WalkMove (edict_t *ent) return; } - if (sv_nostep.integer) - return; + SV_CheckVelocity(ent); - if ( (int)ent->v->flags & FL_WATERJUMP ) + if (sv_nostep.integer || (int)ent->v->flags & FL_WATERJUMP ) return; VectorCopy (ent->v->origin, nosteporg); @@ -1017,7 +1038,7 @@ void SV_WalkMove (edict_t *ent) // move up // FIXME: don't link? - SV_PushEntity (ent, upmove, vec3_origin); + SV_PushEntity(ent, upmove, vec3_origin); // move forward ent->v->velocity[0] = oldvel[0]; @@ -1031,8 +1052,17 @@ void SV_WalkMove (edict_t *ent) if (clip && fabs(oldorg[1] - ent->v->origin[1]) < 0.03125 && fabs(oldorg[0] - ent->v->origin[0]) < 0.03125) - // stepping up didn't make any progress - clip = SV_TryUnstick (ent, oldvel); + { + // stepping up didn't make any progress, revert to original move + VectorCopy(originalmove_origin, ent->v->origin); + VectorCopy(originalmove_velocity, ent->v->velocity); + clip = originalmove_clip; + ent->v->flags = originalmove_flags; + ent->v->groundentity = originalmove_groundentity; + // now try to unstick if needed + //clip = SV_TryUnstick (ent, oldvel); + return; + } // extra friction based on view angle if (clip & 2 && sv_wallfriction.integer) @@ -1059,6 +1089,8 @@ void SV_WalkMove (edict_t *ent) VectorCopy (nosteporg, ent->v->origin); VectorCopy (nostepvel, ent->v->velocity); } + + SV_CheckVelocity(ent); } //============================================================================ @@ -1107,25 +1139,6 @@ void SV_Physics_Follow (edict_t *ent) SV_LinkEdict (ent, true); } -/* -============= -SV_Physics_Noclip - -A moving object that doesn't obey physics -============= -*/ -void SV_Physics_Noclip (edict_t *ent) -{ - // regular thinking - if (!SV_RunThink (ent)) - return; - - VectorMA (ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles); - VectorMA (ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin); - - SV_LinkEdict (ent, false); -} - /* ============================================================================== @@ -1143,7 +1156,7 @@ SV_CheckWaterTransition void SV_CheckWaterTransition (edict_t *ent) { int cont; - cont = Mod_PointContents(ent->v->origin, sv.worldmodel); + cont = SV_PointQ1Contents(ent->v->origin); if (!ent->v->watertype) { // just spawned here @@ -1152,23 +1165,19 @@ void SV_CheckWaterTransition (edict_t *ent) return; } + // check if the entity crossed into or out of water + if ((ent->v->watertype == CONTENTS_WATER || ent->v->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME)) + SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1); + if (cont <= CONTENTS_WATER) { - if (ent->v->watertype == CONTENTS_EMPTY && cont != CONTENTS_LAVA) - // just crossed into water - SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1); - ent->v->watertype = cont; ent->v->waterlevel = 1; } else { - if (ent->v->watertype != CONTENTS_EMPTY && ent->v->watertype != CONTENTS_LAVA) - // just crossed into water - SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1); - ent->v->watertype = CONTENTS_EMPTY; - ent->v->waterlevel = cont; + ent->v->waterlevel = 0; } } @@ -1192,7 +1201,6 @@ void SV_Physics_Toss (edict_t *ent) // if onground, return without moving if ((int)ent->v->flags & FL_ONGROUND) { - VectorClear(ent->v->velocity); if (ent->v->groundentity == 0) return; // if ent was supported by a brush model on previous frame, @@ -1237,9 +1245,11 @@ void SV_Physics_Toss (edict_t *ent) } else if (ent->v->movetype == MOVETYPE_BOUNCE) { + float d; ClipVelocity (ent->v->velocity, trace.plane.normal, ent->v->velocity, 1.5); // LordHavoc: fixed grenades not bouncing when fired down a slope - if (trace.plane.normal[2] > 0.7 && DotProduct(trace.plane.normal, ent->v->velocity) < 60) + d = DotProduct(trace.plane.normal, ent->v->velocity); + if (trace.plane.normal[2] > 0.7 && fabs(d) < 60) { ent->v->flags = (int)ent->v->flags | FL_ONGROUND; ent->v->groundentity = EDICT_TO_PROG(trace.ent); @@ -1289,50 +1299,25 @@ will fall if the floor is pulled out from under them. */ void SV_Physics_Step (edict_t *ent) { - int flags, fall, hitsound; - - // freefall if not fly/swim - fall = true; - flags = (int)ent->v->flags; - if (flags & (FL_FLY | FL_SWIM)) + // freefall if not onground/fly/swim + if (!((int)ent->v->flags & (FL_ONGROUND | FL_FLY | FL_SWIM))) { - if (flags & FL_FLY) - fall = false; - else if ((flags & FL_SWIM) && Mod_PointContents(ent->v->origin, sv.worldmodel) != CONTENTS_EMPTY) - fall = false; - } - if (fall && (flags & FL_ONGROUND) && ent->v->groundentity == 0) - fall = false; + int hitsound = ent->v->velocity[2] < sv_gravity.value * -0.1; - if (fall) - { - if (ent->v->velocity[2] < sv_gravity.value*-0.1) - { - hitsound = true; - if (flags & FL_ONGROUND) - hitsound = false; - } - else - hitsound = false; - - SV_AddGravity (ent); - SV_CheckVelocity (ent); - SV_FlyMove (ent, sv.frametime, NULL); - SV_LinkEdict (ent, false); + SV_AddGravity(ent); + SV_CheckVelocity(ent); + SV_FlyMove(ent, sv.frametime, NULL); + SV_LinkEdict(ent, true); // just hit ground - if ((int)ent->v->flags & FL_ONGROUND) - { - VectorClear(ent->v->velocity); - if (hitsound) - SV_StartSound (ent, 0, "demon/dland2.wav", 255, 1); - } + if (hitsound && (int)ent->v->flags & FL_ONGROUND) + SV_StartSound(ent, 0, "demon/dland2.wav", 255, 1); } // regular thinking - SV_RunThink (ent); + SV_RunThink(ent); - SV_CheckWaterTransition (ent); + SV_CheckWaterTransition(ent); } //============================================================================ @@ -1366,23 +1351,29 @@ void SV_Physics (void) if (pr_global_struct->force_retouch) SV_LinkEdict (ent, true); // force retouch even for stationary - if (i > 0 && i <= svs.maxclients) + if (i <= svs.maxclients) { - if (!svs.clients[i-1].active) - continue; - // connected slot - // call standard client pre-think - SV_CheckVelocity (ent); - pr_global_struct->time = sv.time; - pr_global_struct->self = EDICT_TO_PROG(ent); - PR_ExecuteProgram (pr_global_struct->PlayerPreThink, "QC function PlayerPreThink is missing"); - SV_CheckVelocity (ent); + if (i > 0) + { + if (!svs.clients[i-1].spawned) + continue; + // connected slot + // call standard client pre-think + SV_CheckVelocity (ent); + pr_global_struct->time = sv.time; + pr_global_struct->self = EDICT_TO_PROG(ent); + PR_ExecuteProgram (pr_global_struct->PlayerPreThink, "QC function PlayerPreThink is missing"); + SV_CheckVelocity (ent); + } } + else if (sv_freezenonclients.integer) + continue; // LordHavoc: merged client and normal entity physics switch ((int) ent->v->movetype) { case MOVETYPE_PUSH: + case MOVETYPE_FAKEPUSH: SV_Physics_Pusher (ent); break; case MOVETYPE_NONE: @@ -1394,17 +1385,15 @@ void SV_Physics (void) SV_Physics_Follow (ent); break; case MOVETYPE_NOCLIP: - if (i > 0 && i <= svs.maxclients) + if (SV_RunThink(ent)) { - if (SV_RunThink (ent)) - { - SV_CheckWater (ent); - VectorMA (ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin); - VectorMA (ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles); - } + SV_CheckWater(ent); + VectorMA(ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin); + VectorMA(ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles); } - else - SV_Physics_Noclip (ent); + // relink normal entities here, players always get relinked so don't relink twice + if (!(i > 0 && i <= svs.maxclients)) + SV_LinkEdict(ent, false); break; case MOVETYPE_STEP: SV_Physics_Step (ent); @@ -1416,7 +1405,9 @@ void SV_Physics (void) SV_AddGravity (ent); SV_CheckStuck (ent); SV_WalkMove (ent); - SV_LinkEdict (ent, true); + // relink normal entities here, players always get relinked so don't relink twice + if (!(i > 0 && i <= svs.maxclients)) + SV_LinkEdict (ent, true); } break; case MOVETYPE_TOSS: @@ -1442,7 +1433,7 @@ void SV_Physics (void) break; } - if (i > 0 && i <= svs.maxclients && !ent->e->free) + if (i <= svs.maxclients && i > 0 && !ent->e->free) { SV_CheckVelocity (ent); @@ -1469,7 +1460,8 @@ void SV_Physics (void) PR_ExecuteProgram ((func_t)(EndFrameQC - pr_functions), ""); } - sv.time += sv.frametime; + if (!sv_freezenonclients.integer) + sv.time += sv.frametime; } @@ -1510,9 +1502,8 @@ trace_t SV_Trace_Toss (edict_t *tossent, edict_t *ignore) trace = SV_Move (tent->v->origin, tent->v->mins, tent->v->maxs, end, MOVE_NORMAL, tent); VectorCopy (trace.endpos, tent->v->origin); - if (trace.fraction < 1 && trace.ent) - if (trace.ent != ignore) - break; + if (trace.fraction < 1 && trace.ent && trace.ent != ignore) + break; } tossent->v->solid = savesolid; trace.fraction = 0; // not relevant