X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_phys.c;h=e88baa2578c7e575dabdc0af5c74b45922ad988f;hp=a206a946a770f83a3b73c5a9f6432be293d98160;hb=221a6cb74c3a3b30b9e60247d6e42d7a6fcdebf0;hpb=9de21fccd8226d0cbfd698dee1c4675d666051bd diff --git a/sv_phys.c b/sv_phys.c index a206a946..e88baa25 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -81,19 +81,19 @@ int SV_GenericHitSuperContentsMask(const prvm_edict_t *passedict) else if (PRVM_serveredictfloat(passedict, solid) == SOLID_SLIDEBOX) { if ((int)PRVM_serveredictfloat(passedict, flags) & FL_MONSTER) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP; else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP; } else if (PRVM_serveredictfloat(passedict, solid) == SOLID_CORPSE) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY; else if (PRVM_serveredictfloat(passedict, solid) == SOLID_TRIGGER) - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY; else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE; } else - return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE | SUPERCONTENTS_SKY; + return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE; } /* @@ -109,6 +109,8 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int float pitchsign = 1; prvm_edict_t *traceowner, *touch; trace_t trace; + // temporary storage because prvm_vec_t may differ from vec_t + vec3_t touchmins, touchmaxs; // bounding box of entire move area vec3_t clipboxmins, clipboxmaxs; // size when clipping against monsters @@ -136,7 +138,7 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int // clip to world Collision_ClipPointToWorld(&cliptrace, sv.worldmodel, clipstart, hitsupercontentsmask); - cliptrace.bmodelstartsolid = cliptrace.startsolid; + cliptrace.worldstartsolid = cliptrace.bmodelstartsolid = cliptrace.startsolid; if (cliptrace.startsolid || cliptrace.fraction < 1) cliptrace.ent = prog->edicts; if (type == MOVE_WORLDONLY) @@ -224,12 +226,14 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int Matrix4x4_CreateTranslate(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2]); Matrix4x4_Invert_Simple(&imatrix, &matrix); VM_GenerateFrameGroupBlend(prog, touch->priv.server->framegroupblend, touch); - VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model); + VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model, sv.time); VM_UpdateEdictSkeleton(prog, touch, model, touch->priv.server->frameblend); + VectorCopy(PRVM_serveredictvector(touch, mins), touchmins); + VectorCopy(PRVM_serveredictvector(touch, maxs), touchmaxs); if (type == MOVE_MISSILE && (int)PRVM_serveredictfloat(touch, flags) & FL_MONSTER) - Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs), bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipstart, hitsupercontentsmask); + Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touchmins, touchmaxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipstart, hitsupercontentsmask); else - Collision_ClipPointToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs), bodysupercontents, &matrix, &imatrix, clipstart, hitsupercontentsmask); + Collision_ClipPointToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touchmins, touchmaxs, bodysupercontents, &matrix, &imatrix, clipstart, hitsupercontentsmask); Collision_CombineTraces(&cliptrace, &trace, (void *)touch, PRVM_serveredictfloat(touch, solid) == SOLID_BSP); } @@ -255,6 +259,8 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ float pitchsign = 1; prvm_edict_t *traceowner, *touch; trace_t trace; + // temporary storage because prvm_vec_t may differ from vec_t + vec3_t touchmins, touchmaxs; // bounding box of entire move area vec3_t clipboxmins, clipboxmaxs; // size when clipping against monsters @@ -303,7 +309,7 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ // clip to world Collision_ClipLineToWorld(&cliptrace, sv.worldmodel, clipstart, clipend, hitsupercontentsmask, false); - cliptrace.bmodelstartsolid = cliptrace.startsolid; + cliptrace.worldstartsolid = cliptrace.bmodelstartsolid = cliptrace.startsolid; if (cliptrace.startsolid || cliptrace.fraction < 1) cliptrace.ent = prog->edicts; if (type == MOVE_WORLDONLY) @@ -391,12 +397,14 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ Matrix4x4_CreateTranslate(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2]); Matrix4x4_Invert_Simple(&imatrix, &matrix); VM_GenerateFrameGroupBlend(prog, touch->priv.server->framegroupblend, touch); - VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model); + VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model, sv.time); VM_UpdateEdictSkeleton(prog, touch, model, touch->priv.server->frameblend); + VectorCopy(PRVM_serveredictvector(touch, mins), touchmins); + VectorCopy(PRVM_serveredictvector(touch, maxs), touchmaxs); if (type == MOVE_MISSILE && (int)PRVM_serveredictfloat(touch, flags) & FL_MONSTER) - Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs), bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask); + Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touchmins, touchmaxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask); else - Collision_ClipLineToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs), bodysupercontents, &matrix, &imatrix, clipstart, clipend, hitsupercontentsmask, false); + Collision_ClipLineToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touchmins, touchmaxs, bodysupercontents, &matrix, &imatrix, clipstart, clipend, hitsupercontentsmask, false); Collision_CombineTraces(&cliptrace, &trace, (void *)touch, PRVM_serveredictfloat(touch, solid) == SOLID_BSP); } @@ -436,6 +444,8 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co qboolean pointtrace; prvm_edict_t *traceowner, *touch; trace_t trace; + // temporary storage because prvm_vec_t may differ from vec_t + vec3_t touchmins, touchmaxs; // bounding box of entire move area vec3_t clipboxmins, clipboxmaxs; // size of the moving object @@ -506,7 +516,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co // clip to world Collision_ClipToWorld(&cliptrace, sv.worldmodel, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask); - cliptrace.bmodelstartsolid = cliptrace.startsolid; + cliptrace.worldstartsolid = cliptrace.bmodelstartsolid = cliptrace.startsolid; if (cliptrace.startsolid || cliptrace.fraction < 1) cliptrace.ent = prog->edicts; if (type == MOVE_WORLDONLY) @@ -605,12 +615,14 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co Matrix4x4_CreateTranslate(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2]); Matrix4x4_Invert_Simple(&imatrix, &matrix); VM_GenerateFrameGroupBlend(prog, touch->priv.server->framegroupblend, touch); - VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model); + VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model, sv.time); VM_UpdateEdictSkeleton(prog, touch, model, touch->priv.server->frameblend); + VectorCopy(PRVM_serveredictvector(touch, mins), touchmins); + VectorCopy(PRVM_serveredictvector(touch, maxs), touchmaxs); if (type == MOVE_MISSILE && (int)PRVM_serveredictfloat(touch, flags) & FL_MONSTER) - Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs), bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask); + Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touchmins, touchmaxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask); else - Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs), bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask); + Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touchmins, touchmaxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask); Collision_CombineTraces(&cliptrace, &trace, (void *)touch, PRVM_serveredictfloat(touch, solid) == SOLID_BSP); } @@ -711,8 +723,11 @@ int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_e vec3_t paddedmins, paddedmaxs; if (maxedicts < 1 || resultedicts == NULL) return 0; - VectorSet(paddedmins, mins[0] - 10, mins[1] - 10, mins[2] - 1); - VectorSet(paddedmaxs, maxs[0] + 10, maxs[1] + 10, maxs[2] + 1); + // LordHavoc: discovered this actually causes its own bugs (dm6 teleporters being too close to info_teleport_destination) + //VectorSet(paddedmins, mins[0] - 10, mins[1] - 10, mins[2] - 1); + //VectorSet(paddedmaxs, maxs[0] + 10, maxs[1] + 10, maxs[2] + 1); + VectorCopy(mins, paddedmins); + VectorCopy(maxs, paddedmaxs); if (sv_areadebug.integer) { int numresultedicts = 0; @@ -837,7 +852,7 @@ void SV_LinkEdict (prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; dp_model_t *model; - vec3_t mins, maxs; + vec3_t mins, maxs, entmins, entmaxs, entangles; int modelindex; if (ent == prog->edicts) @@ -855,7 +870,7 @@ void SV_LinkEdict (prvm_edict_t *ent) model = SV_GetModelByIndex(modelindex); VM_GenerateFrameGroupBlend(prog, ent->priv.server->framegroupblend, ent); - VM_FrameBlendFromFrameGroupBlend(ent->priv.server->frameblend, ent->priv.server->framegroupblend, model); + VM_FrameBlendFromFrameGroupBlend(ent->priv.server->frameblend, ent->priv.server->framegroupblend, model, sv.time); VM_UpdateEdictSkeleton(prog, ent, model, ent->priv.server->frameblend); // set the abs box @@ -864,7 +879,10 @@ void SV_LinkEdict (prvm_edict_t *ent) { // TODO maybe should do this for rotating SOLID_BSP too? Would behave better with rotating doors // TODO special handling for spheres? - RotateBBox(PRVM_serveredictvector(ent, mins), PRVM_serveredictvector(ent, maxs), PRVM_serveredictvector(ent, angles), mins, maxs); + VectorCopy(PRVM_serveredictvector(ent, mins), entmins); + VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs); + VectorCopy(PRVM_serveredictvector(ent, angles), entangles); + RotateBBox(entmins, entmaxs, entangles, mins, maxs); VectorAdd(PRVM_serveredictvector(ent, origin), mins, mins); VectorAdd(PRVM_serveredictvector(ent, origin), maxs, maxs); } @@ -954,11 +972,14 @@ static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset) { prvm_prog_t *prog = SVVM_prog; int contents; - vec3_t org; + vec3_t org, entorigin, entmins, entmaxs; trace_t trace; contents = SV_GenericHitSuperContentsMask(ent); VectorAdd(PRVM_serveredictvector(ent, origin), offset, org); - trace = SV_TraceBox(org, PRVM_serveredictvector(ent, mins), PRVM_serveredictvector(ent, maxs), PRVM_serveredictvector(ent, origin), ((PRVM_serveredictfloat(ent, movetype) == MOVETYPE_FLY_WORLDONLY) ? MOVE_WORLDONLY : MOVE_NOMONSTERS), ent, contents); + VectorCopy(PRVM_serveredictvector(ent, origin), entorigin); + VectorCopy(PRVM_serveredictvector(ent, mins), entmins); + VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs); + trace = SV_TraceBox(org, entmins, entmaxs, entorigin, ((PRVM_serveredictfloat(ent, movetype) == MOVETYPE_FLY_WORLDONLY) ? MOVE_WORLDONLY : MOVE_NOMONSTERS), ent, contents); if (trace.startsupercontents & contents) return true; else @@ -971,8 +992,8 @@ static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset) // FIXME: this breaks entities larger than the hull size int i; vec3_t v, m1, m2, s; - VectorAdd(org, PRVM_serveredictvector(ent, mins), m1); - VectorAdd(org, PRVM_serveredictvector(ent, maxs), m2); + VectorAdd(org, entmins, m1); + VectorAdd(org, entmaxs, m2); VectorSubtract(m2, m1, s); #define EPSILON (1.0f / 32.0f) if (s[0] >= EPSILON*2) {m1[0] += EPSILON;m2[0] -= EPSILON;} @@ -997,7 +1018,7 @@ static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset) #else // verify if the endpos is REALLY outside solid VectorCopy(trace.endpos, org); - trace = SV_TraceBox(org, PRVM_serveredictvector(ent, mins), PRVM_serveredictvector(ent, maxs), org, MOVE_NOMONSTERS, ent, contents); + trace = SV_TraceBox(org, entmins, entmaxs, org, MOVE_NOMONSTERS, ent, contents); if(trace.startsolid) Con_Printf("SV_TestEntityPosition: trace.endpos detected to be in solid. NOT using it.\n"); else @@ -1065,12 +1086,12 @@ void SV_CheckVelocity (prvm_edict_t *ent) // for (i=0 ; i<3 ; i++) { - if (IS_NAN(PRVM_serveredictvector(ent, velocity)[i])) + if (PRVM_IS_NAN(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 (IS_NAN(PRVM_serveredictvector(ent, origin)[i])) + if (PRVM_IS_NAN(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; @@ -1190,7 +1211,7 @@ returns the blocked flags (1 = floor, 2 = step / wall) ================== */ #define STOP_EPSILON 0.1 -static void ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce) +static void ClipVelocity (prvm_vec3_t in, vec3_t normal, prvm_vec3_t out, prvm_vec_t overbounce) { int i; float backoff; @@ -1218,7 +1239,7 @@ 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 qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, qboolean dolink); +static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean dolink); #define MAX_CLIP_PLANES 5 static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, float *stepnormal, int hitsupercontentsmask, float stepheight) { @@ -1226,7 +1247,8 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo int blocked, bumpcount; int i, j, numplanes; float d, time_left, gravity; - vec3_t dir, push, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity; + vec3_t dir, push, planes[MAX_CLIP_PLANES]; + prvm_vec3_t primal_velocity, original_velocity, new_velocity, restore_velocity; #if 0 vec3_t end; #endif @@ -1235,23 +1257,21 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo return 0; gravity = 0; - if(sv_gameplayfix_nogravityonground.integer) - if((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) - applygravity = false; + VectorCopy(PRVM_serveredictvector(ent, velocity), restore_velocity); - if (applygravity) + if(applygravity) { - if (sv_gameplayfix_gravityunaffectedbyticrate.integer) - { - gravity = SV_Gravity(ent) * 0.5f; - PRVM_serveredictvector(ent, velocity)[2] -= gravity; - } - else + gravity = SV_Gravity(ent); + + if(!sv_gameplayfix_nogravityonground.integer || !((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND)) { - applygravity = false; - PRVM_serveredictvector(ent, velocity)[2] -= SV_Gravity(ent); + if (sv_gameplayfix_gravityunaffectedbyticrate.integer) + PRVM_serveredictvector(ent, velocity)[2] -= gravity * 0.5f; + else + PRVM_serveredictvector(ent, velocity)[2] -= gravity; } } + blocked = 0; VectorCopy(PRVM_serveredictvector(ent, velocity), original_velocity); VectorCopy(PRVM_serveredictvector(ent, velocity), primal_velocity); @@ -1263,7 +1283,7 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo break; VectorScale(PRVM_serveredictvector(ent, velocity), time_left, push); - if(!SV_PushEntity(&trace, ent, push, false, false)) + if(!SV_PushEntity(&trace, ent, push, false)) { // we got teleported by a touch function // let's abort the move @@ -1271,6 +1291,14 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo break; } + // 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) + { + VectorCopy(restore_velocity, PRVM_serveredictvector(ent, velocity)); + return 3; + } + if (trace.fraction == 1) break; if (trace.plane.normal[2]) @@ -1301,20 +1329,20 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo //Con_Printf("step %f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); VectorSet(steppush, 0, 0, stepheight); VectorCopy(PRVM_serveredictvector(ent, origin), org); - if(!SV_PushEntity(&steptrace, ent, steppush, false, false)) + if(!SV_PushEntity(&steptrace, ent, steppush, false)) { 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, false)) + if(!SV_PushEntity(&steptrace2, ent, push, false)) { 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, false)) + if(!SV_PushEntity(&steptrace3, ent, steppush, false)) { blocked |= 8; break; @@ -1437,8 +1465,16 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo // LordHavoc: this came from QW and allows you to get out of water more easily if (sv_gameplayfix_easierwaterjump.integer && ((int)PRVM_serveredictfloat(ent, flags) & FL_WATERJUMP) && !(blocked & 8)) VectorCopy(primal_velocity, PRVM_serveredictvector(ent, velocity)); - if (applygravity && !((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND)) - PRVM_serveredictvector(ent, velocity)[2] -= gravity; + + if(applygravity) + { + if(!sv_gameplayfix_nogravityonground.integer || !((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND)) + { + if (sv_gameplayfix_gravityunaffectedbyticrate.integer) + PRVM_serveredictvector(ent, velocity)[2] -= gravity * 0.5f; + } + } + return blocked; } @@ -1549,10 +1585,10 @@ static qboolean SV_NudgeOutOfSolid_PivotIsKnownGood(prvm_edict_t *ent, vec3_t pi return true; } -static qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent) +qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; - int bump; + int bump, pass; trace_t stucktrace; vec3_t stuckorigin; vec3_t stuckmins, stuckmaxs; @@ -1560,7 +1596,6 @@ static qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent) vec_t separation = sv_gameplayfix_nudgeoutofsolid_separation.value; if (sv.worldmodel && sv.worldmodel->brushq1.numclipnodes) separation = 0.0f; // when using hulls, it can not be enlarged - VectorCopy(PRVM_serveredictvector(ent, origin), stuckorigin); VectorCopy(PRVM_serveredictvector(ent, mins), stuckmins); VectorCopy(PRVM_serveredictvector(ent, maxs), stuckmaxs); stuckmins[0] -= separation; @@ -1569,17 +1604,23 @@ static qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent) stuckmaxs[0] += separation; stuckmaxs[1] += separation; stuckmaxs[2] += separation; - for (bump = 0;bump < 10;bump++) + // first pass we try to get it out of brush entities + // second pass we try to get it out of world only (can't win them all) + for (pass = 0;pass < 2;pass++) { - stucktrace = SV_TraceBox(stuckorigin, stuckmins, stuckmaxs, stuckorigin, MOVE_NOMONSTERS, ent, SV_GenericHitSuperContentsMask(ent)); - if (!stucktrace.bmodelstartsolid || stucktrace.startdepth >= 0) + VectorCopy(PRVM_serveredictvector(ent, origin), stuckorigin); + for (bump = 0;bump < 10;bump++) { - // found a good location, use it - VectorCopy(stuckorigin, PRVM_serveredictvector(ent, origin)); - return true; + stucktrace = SV_TraceBox(stuckorigin, stuckmins, stuckmaxs, stuckorigin, pass ? MOVE_WORLDONLY : MOVE_NOMONSTERS, ent, SV_GenericHitSuperContentsMask(ent)); + if (!stucktrace.bmodelstartsolid || stucktrace.startdepth >= 0) + { + // found a good location, use it + VectorCopy(stuckorigin, PRVM_serveredictvector(ent, origin)); + return true; + } + nudge = -stucktrace.startdepth; + VectorMA(stuckorigin, nudge, stucktrace.startdepthnormal, stuckorigin); } - nudge = -stucktrace.startdepth; - VectorMA(stuckorigin, nudge, stucktrace.startdepthnormal, stuckorigin); } return false; } @@ -1593,14 +1634,13 @@ 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 qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, qboolean dolink) +static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean dolink) { prvm_prog_t *prog = SVVM_prog; int solid; int movetype; int type; vec3_t mins, maxs; - vec3_t original, original_velocity; vec3_t start; vec3_t end; @@ -1628,13 +1668,13 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q type = MOVE_NORMAL; *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent)); - if (trace->bmodelstartsolid && failonbmodelstartsolid) + // fail the move if stuck in world + if (trace->worldstartsolid) return true; VectorCopy(trace->endpos, PRVM_serveredictvector(ent, origin)); - VectorCopy(PRVM_serveredictvector(ent, origin), original); - VectorCopy(PRVM_serveredictvector(ent, velocity), original_velocity); + ent->priv.required->mark = PRVM_EDICT_MARK_WAIT_FOR_SETORIGIN; // -2: setorigin running SV_LinkEdict(ent); @@ -1652,7 +1692,21 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q 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); - return VectorCompare(PRVM_serveredictvector(ent, origin), original) && VectorCompare(PRVM_serveredictvector(ent, velocity), original_velocity); + if(ent->priv.required->mark == PRVM_EDICT_MARK_SETORIGIN_CAUGHT) + { + ent->priv.required->mark = 0; + return false; + } + else if(ent->priv.required->mark == PRVM_EDICT_MARK_WAIT_FOR_SETORIGIN) + { + ent->priv.required->mark = 0; + return true; + } + else + { + Con_Printf("The edict mark had been overwritten! Please debug this.\n"); + return true; + } } @@ -1670,7 +1724,7 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) int checkcontents; qboolean rotated; float savesolid, movetime2, pushltime; - vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org; + vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org, pushermins, pushermaxs, checkorigin, checkmins, checkmaxs; int num_moved; int numcheckentities; static prvm_edict_t *checkentities[MAX_EDICTS]; @@ -1834,7 +1888,12 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) // final position, move it if (!((int)PRVM_serveredictfloat(check, flags) & FL_ONGROUND) || PRVM_PROG_TO_EDICT(PRVM_serveredictedict(check, groundentity)) != pusher) { - Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, PRVM_serveredictvector(pusher, mins), PRVM_serveredictvector(pusher, maxs), SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, PRVM_serveredictvector(check, origin), PRVM_serveredictvector(check, mins), PRVM_serveredictvector(check, maxs), PRVM_serveredictvector(check, origin), checkcontents); + VectorCopy(PRVM_serveredictvector(pusher, mins), pushermins); + VectorCopy(PRVM_serveredictvector(pusher, maxs), pushermaxs); + VectorCopy(PRVM_serveredictvector(check, origin), checkorigin); + VectorCopy(PRVM_serveredictvector(check, mins), checkmins); + VectorCopy(PRVM_serveredictvector(check, maxs), checkmaxs); + Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, pushermins, pushermaxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, checkorigin, checkmins, checkmaxs, checkorigin, checkcontents); //trace = SV_TraceBox(PRVM_serveredictvector(check, origin), PRVM_serveredictvector(check, mins), PRVM_serveredictvector(check, maxs), PRVM_serveredictvector(check, origin), MOVE_NOMONSTERS, check, checkcontents); if (!trace.startsolid) { @@ -1877,7 +1936,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, true)) + if(!SV_PushEntity (&trace, check, move, true)) { // entity "check" got teleported PRVM_serveredictvector(check, angles)[1] += trace.fraction * moveangle[1]; @@ -1896,7 +1955,12 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) PRVM_serveredictfloat(check, flags) = (int)PRVM_serveredictfloat(check, flags) & ~FL_ONGROUND; // if it is still inside the pusher, block - Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, PRVM_serveredictvector(pusher, mins), PRVM_serveredictvector(pusher, maxs), SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, PRVM_serveredictvector(check, origin), PRVM_serveredictvector(check, mins), PRVM_serveredictvector(check, maxs), PRVM_serveredictvector(check, origin), checkcontents); + VectorCopy(PRVM_serveredictvector(pusher, mins), pushermins); + VectorCopy(PRVM_serveredictvector(pusher, maxs), pushermaxs); + VectorCopy(PRVM_serveredictvector(check, origin), checkorigin); + VectorCopy(PRVM_serveredictvector(check, mins), checkmins); + VectorCopy(PRVM_serveredictvector(check, maxs), checkmaxs); + Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, pushermins, pushermaxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, checkorigin, checkmins, checkmaxs, checkorigin, checkcontents); if (trace.startsolid) { vec3_t move2; @@ -1904,7 +1968,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, true)) + if(!SV_PushEntity(&trace2, check, move2, true)) { // entity "check" got teleported continue; @@ -2192,9 +2256,10 @@ static void SV_WallFriction (prvm_edict_t *ent, float *stepnormal) { prvm_prog_t *prog = SVVM_prog; float d, i; - vec3_t forward, into, side; + vec3_t forward, into, side, v_angle; - AngleVectors (PRVM_serveredictvector(ent, v_angle), forward, NULL, NULL); + VectorCopy(PRVM_serveredictvector(ent, v_angle), v_angle); + AngleVectors (v_angle, forward, NULL, NULL); if ((d = DotProduct (stepnormal, forward) + 0.5) < 0) { // cut the tangential velocity @@ -2285,7 +2350,7 @@ static void SV_WalkMove (prvm_edict_t *ent) int originalmove_groundentity; int hitsupercontentsmask; int type; - vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity; + vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity, entmins, entmaxs; trace_t downtrace, trace; qboolean applygravity; @@ -2327,7 +2392,9 @@ static void SV_WalkMove (prvm_edict_t *ent) type = MOVE_NOMONSTERS; // only clip against bmodels else type = MOVE_NORMAL; - trace = SV_TraceBox(upmove, PRVM_serveredictvector(ent, mins), PRVM_serveredictvector(ent, maxs), downmove, type, ent, SV_GenericHitSuperContentsMask(ent)); + VectorCopy(PRVM_serveredictvector(ent, mins), entmins); + VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs); + trace = SV_TraceBox(upmove, entmins, entmaxs, downmove, type, ent, SV_GenericHitSuperContentsMask(ent)); if(trace.fraction < 1 && trace.plane.normal[2] > 0.7) clip |= 1; // but we HAVE found a floor } @@ -2369,7 +2436,7 @@ static void SV_WalkMove (prvm_edict_t *ent) return; // only step up while jumping if that is enabled - if (!(sv_jumpstep.integer && sv_gameplayfix_stepwhilejumping.integer)) + if (sv_jumpstep.integer) if (!oldonground && PRVM_serveredictfloat(ent, waterlevel) == 0) return; } @@ -2382,7 +2449,7 @@ static void SV_WalkMove (prvm_edict_t *ent) // move up VectorClear (upmove); upmove[2] = sv_stepheight.value; - if(!SV_PushEntity(&trace, ent, upmove, false, true)) + if(!SV_PushEntity(&trace, ent, upmove, true)) { // we got teleported when upstepping... must abort the move return; @@ -2434,7 +2501,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, false, true)) + if(!SV_PushEntity (&downtrace, ent, downmove, true)) { // we got teleported when downstepping... must abort the move return; @@ -2536,10 +2603,12 @@ SV_CheckWaterTransition */ static void SV_CheckWaterTransition (prvm_edict_t *ent) { + vec3_t entorigin; prvm_prog_t *prog = SVVM_prog; // LordHavoc: bugfixes in this function are keyed to the sv_gameplayfix_bugfixedcheckwatertransition cvar - if this cvar is 0 then all the original bugs should be reenabled for compatibility int cont; - cont = Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(PRVM_serveredictvector(ent, origin))); + VectorCopy(PRVM_serveredictvector(ent, origin), entorigin); + cont = Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(entorigin)); if (!PRVM_serveredictfloat(ent, watertype)) { // just spawned here @@ -2638,16 +2707,15 @@ void SV_Physics_Toss (prvm_edict_t *ent) { // move origin VectorScale(PRVM_serveredictvector(ent, velocity), movetime, move); - if(!SV_PushEntity(&trace, ent, move, true, true)) + if(!SV_PushEntity(&trace, ent, move, true)) return; // teleported if (ent->priv.server->free) return; - if (trace.bmodelstartsolid) + if (trace.bmodelstartsolid && sv_gameplayfix_unstickentities.integer) { // try to unstick the entity - if (sv_gameplayfix_unstickentities.integer) - SV_UnstickEntity(ent); - if(!SV_PushEntity(&trace, ent, move, false, true)) + SV_UnstickEntity(ent); + if(!SV_PushEntity(&trace, ent, move, true)) return; // teleported if (ent->priv.server->free) return; @@ -2919,7 +2987,7 @@ void SV_Physics_ClientMove(void) { // angle fixing was requested by physics code... // so store the current angles for later use - memcpy(host_client->fixangle_angles, PRVM_serveredictvector(ent, angles), sizeof(host_client->fixangle_angles)); + VectorCopy(PRVM_serveredictvector(ent, angles), host_client->fixangle_angles); host_client->fixangle_angles_set = TRUE; // and clear fixangle for the next frame @@ -2931,7 +2999,7 @@ static void SV_Physics_ClientEntity_PreThink(prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; // don't do physics on disconnected clients, FrikBot relies on this - if (!host_client->spawned) + if (!host_client->begun) return; // make sure the velocity is sane (not a NaN) @@ -2960,7 +3028,7 @@ static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; // don't do physics on disconnected clients, FrikBot relies on this - if (!host_client->spawned) + if (!host_client->begun) return; // make sure the velocity is sane (not a NaN) @@ -2978,7 +3046,7 @@ static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent) { // angle fixing was requested by physics code... // so store the current angles for later use - memcpy(host_client->fixangle_angles, PRVM_serveredictvector(ent, angles), sizeof(host_client->fixangle_angles)); + VectorCopy(PRVM_serveredictvector(ent, angles), host_client->fixangle_angles); host_client->fixangle_angles_set = TRUE; // and clear fixangle for the next frame @@ -2997,7 +3065,7 @@ static void SV_Physics_ClientEntity(prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; // don't do physics on disconnected clients, FrikBot relies on this - if (!host_client->spawned) + if (!host_client->begun) { memset(&host_client->cmd, 0, sizeof(host_client->cmd)); return;