X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=411a7c969b748382a723df0a2ef2d28983d17d63;hb=3dec4376ce1b06989ff9ac0cced50d26c7012888;hp=35bc3410cc7c7382710358a62afefad8606608a1;hpb=363fbad63b6695840da972d434fd4f8daf398641;p=xonotic%2Fdarkplaces.git diff --git a/sv_phys.c b/sv_phys.c index 35bc3410..411a7c96 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -1041,12 +1041,12 @@ void SV_CheckVelocity (prvm_edict_t *ent) // for (i=0 ; i<3 ; i++) { - if (PRVM_IS_NAN(PRVM_serveredictvector(ent, velocity)[i])) + if (isnan(PRVM_serveredictvector(ent, velocity)[i])) { Con_Printf("Got a NaN velocity on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); PRVM_serveredictvector(ent, velocity)[i] = 0; } - if (PRVM_IS_NAN(PRVM_serveredictvector(ent, origin)[i])) + if (isnan(PRVM_serveredictvector(ent, origin)[i])) { Con_Printf("Got a NaN origin on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); PRVM_serveredictvector(ent, origin)[i] = 0; @@ -1194,13 +1194,12 @@ If stepnormal is not NULL, the plane normal of any vertical wall hit will be sto ============ */ static float SV_Gravity (prvm_edict_t *ent); -static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink); +static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink, qbool checkstuck); #define MAX_CLIP_PLANES 5 static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float *stepnormal, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask, float stepheight) { prvm_prog_t *prog = SVVM_prog; - int blocked, bumpcount; - int i, j, numplanes; + unsigned int i, j, numplanes, blocked, bumpcount; float d, time_left, gravity; vec3_t dir, push, planes[MAX_CLIP_PLANES]; prvm_vec3_t primal_velocity, original_velocity, new_velocity, restore_velocity; @@ -1238,7 +1237,7 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float break; VectorScale(PRVM_serveredictvector(ent, velocity), time_left, push); - if(!SV_PushEntity(&trace, ent, push, false)) + if(!SV_PushEntity(&trace, ent, push, false, true)) { // we got teleported by a touch function // let's abort the move @@ -1248,7 +1247,7 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float // this code is used by MOVETYPE_WALK and MOVETYPE_STEP and SV_UnstickEntity // abort move if we're stuck in the world (and didn't make it out) - if (trace.worldstartsolid && trace.allsolid) + if (trace.worldstartsolid && trace.allsolid && trace.startdepth < 0) { VectorCopy(restore_velocity, PRVM_serveredictvector(ent, velocity)); return 3; @@ -1288,20 +1287,20 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float VectorSet(steppush, 0, 0, stepheight); VectorScale(PRVM_serveredictvector(ent, velocity), time_left, push); VectorCopy(PRVM_serveredictvector(ent, origin), org); - if(!SV_PushEntity(&steptrace, ent, steppush, false)) + if(!SV_PushEntity(&steptrace, ent, steppush, false, true)) { blocked |= 8; break; } //Con_Printf("%f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); - if(!SV_PushEntity(&steptrace2, ent, push, false)) + if(!SV_PushEntity(&steptrace2, ent, push, false, true)) { blocked |= 8; break; } //Con_Printf("%f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); VectorSet(steppush, 0, 0, org[2] - PRVM_serveredictvector(ent, origin)[2]); - if(!SV_PushEntity(&steptrace3, ent, steppush, false)) + if(!SV_PushEntity(&steptrace3, ent, steppush, false, true)) { blocked |= 8; break; @@ -1332,6 +1331,14 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float if (stepnormal) VectorCopy(trace.plane.normal, stepnormal); } + + // Unlike some other movetypes Quake's SV_FlyMove calls SV_Impact only after setting ONGROUND which id1 fiends rely on. + // If we stepped up (sv_gameplayfix_stepmultipletimes) this will impact the steptrace2 plane instead of the original. + if (PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace.ent) + SV_Impact(ent, &trace); + if (ent->free) + return blocked; // removed by the impact function + if (trace.fraction >= 0.001) { // actually covered some distance @@ -1552,7 +1559,7 @@ The trace struct is filled with the trace that has been done. Returns true if the push did not result in the entity being teleported by QC code. ============ */ -static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink) +static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink, qbool checkstuck) { prvm_prog_t *prog = SVVM_prog; int solid; @@ -1567,12 +1574,6 @@ static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboo VectorCopy(PRVM_serveredictvector(ent, mins), mins); VectorCopy(PRVM_serveredictvector(ent, maxs), maxs); - // move start position out of solids - if (sv_gameplayfix_nudgeoutofsolid.integer && sv_gameplayfix_nudgeoutofsolid_separation.value >= 0) - { - PHYS_NudgeOutOfSolid(prog, ent); - } - VectorCopy(PRVM_serveredictvector(ent, origin), start); VectorAdd(start, push, end); @@ -1586,9 +1587,37 @@ static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboo type = MOVE_NORMAL; *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); - // fail the move if stuck in world - if (trace->worldstartsolid) - return true; + // abort move if we're stuck in the world (and didn't make it out) + if (trace->worldstartsolid && trace->allsolid && trace->startdepth < 0 && checkstuck) + { + // checking startdepth eliminates many false positives on Q1BSP with mod_q1bsp_polygoncollisions 0 + // but it's still not guaranteed that we're stuck in a bmodel at this point + if (sv_gameplayfix_nudgeoutofsolid.integer && sv_gameplayfix_nudgeoutofsolid_separation.value >= 0) + { + switch (PHYS_NudgeOutOfSolid(prog, ent)) + { + case 0: + Con_Printf(CON_WARN "NudgeOutOfSolid couldn't fix stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); + return true; // definitely stuck in a bmodel + case 1: + Con_DPrintf("NudgeOutOfSolid fixed stuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname)), PRVM_serveredictvector(ent, origin)[0] - start[0], PRVM_serveredictvector(ent, origin)[1] - start[1], PRVM_serveredictvector(ent, origin)[2] - start[2]); + VectorCopy(PRVM_serveredictvector(ent, origin), start); + VectorAdd(start, push, end); + *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); + + // definitely not stuck in a bmodel, move may proceed + } + } + else if (sv_gameplayfix_unstickentities.integer && SV_UnstickEntity(ent)) + { + // bones_was_here: pretty sure we can deprecate sv_gameplayfix_unstickentities, sv_gameplayfix_nudgeoutofsolid is much nicer + VectorCopy(PRVM_serveredictvector(ent, origin), start); + VectorAdd(start, push, end); + *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); + } + else + return true; // assuming stuck, bones_was_here TODO: always use PHYS_NudgeOutOfSolid (remove sv_gameplayfix_nudgeoutofsolid)? + } VectorCopy(trace->endpos, PRVM_serveredictvector(ent, origin)); @@ -1605,10 +1634,12 @@ static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboo #endif if (dolink) + { SV_LinkEdict_TouchAreaGrid(ent); - if((PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace->ent && (!((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) || PRVM_serveredictedict(ent, groundentity) != PRVM_EDICT_TO_PROG(trace->ent)))) - SV_Impact (ent, trace); + if((PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace->ent && (!((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) || PRVM_serveredictedict(ent, groundentity) != PRVM_EDICT_TO_PROG(trace->ent)))) + SV_Impact (ent, trace); + } if(ent->priv.required->mark == PRVM_EDICT_MARK_SETORIGIN_CAUGHT) { @@ -1854,7 +1885,7 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) // try moving the contacted entity PRVM_serveredictfloat(pusher, solid) = SOLID_NOT; - if(!SV_PushEntity (&trace, check, move, true)) + if(!SV_PushEntity(&trace, check, move, true, true)) { // entity "check" got teleported PRVM_serveredictvector(check, angles)[1] += trace.fraction * moveangle[1]; @@ -1886,7 +1917,7 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) { // hack to invoke all necessary movement triggers VectorClear(move2); - if(!SV_PushEntity(&trace2, check, move2, true)) + if(!SV_PushEntity(&trace2, check, move2, true, true)) { // entity "check" got teleported continue; @@ -2371,7 +2402,7 @@ static void SV_WalkMove (prvm_edict_t *ent) // move up VectorClear (upmove); upmove[2] = sv_stepheight.value; - if(!SV_PushEntity(&trace, ent, upmove, true)) + if(!SV_PushEntity(&trace, ent, upmove, true, true)) { // we got teleported when upstepping... must abort the move return; @@ -2423,7 +2454,7 @@ static void SV_WalkMove (prvm_edict_t *ent) // move down VectorClear (downmove); downmove[2] = -sv_stepheight.value + start_velocity[2]*sv.frametime; - if(!SV_PushEntity (&downtrace, ent, downmove, true)) + if(!SV_PushEntity(&downtrace, ent, downmove, true, true)) { // we got teleported when downstepping... must abort the move return; @@ -2625,19 +2656,12 @@ void SV_Physics_Toss (prvm_edict_t *ent) { // move origin VectorScale(PRVM_serveredictvector(ent, velocity), movetime, move); - if(!SV_PushEntity(&trace, ent, move, true)) + // The buzzsaw traps in r2m6 and r2m7 use MOVETYPE_FLY and rely on moving while stuck in the world. + // Quake movetypes checked allsolid only in SV_FlyMove(). + if(!SV_PushEntity(&trace, ent, move, true, PRVM_serveredictfloat(ent, movetype) != MOVETYPE_FLY)) return; // teleported if (ent->free) return; - if (trace.bmodelstartsolid && sv_gameplayfix_unstickentities.integer) - { - // try to unstick the entity - SV_UnstickEntity(ent); - if(!SV_PushEntity(&trace, ent, move, true)) - return; // teleported - if (ent->free) - return; - } if (trace.fraction == 1) break; movetime *= 1 - min(1, trace.fraction); @@ -2925,6 +2949,7 @@ static void SV_Physics_ClientEntity_NoThink (prvm_edict_t *ent) } } +// asynchronous path void SV_Physics_ClientMove(void) { prvm_prog_t *prog = SVVM_prog;