X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=c88ff4c452193c721fa782bb2844169c824ff836;hb=b0cf9e63ac2bba7fd155b2bb53318fc85ef168d6;hp=a3f84f4b0230910cec2b0ca1799c0a675f8e6e16;hpb=3579ea0a97797b72298e63b723b65e46ea264b14;p=xonotic%2Fdarkplaces.git diff --git a/sv_phys.c b/sv_phys.c index a3f84f4b..c88ff4c4 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // sv_phys.c #include "quakedef.h" +#include "prvm_cmds.h" /* @@ -43,7 +44,7 @@ solid_edge items only clip against bsp models. void SV_Physics_Toss (prvm_edict_t *ent); -int SV_GetPitchSign(prvm_edict_t *ent) +int SV_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent) { dp_model_t *model; if ( @@ -71,6 +72,7 @@ LINE TESTING IN HULLS int SV_GenericHitSuperContentsMask(const prvm_edict_t *passedict) { + prvm_prog_t *prog = SVVM_prog; if (passedict) { int dphitcontentsmask = (int)PRVM_serveredictfloat(passedict, dphitcontentsmask); @@ -101,6 +103,7 @@ SV_TracePoint */ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask) { + prvm_prog_t *prog = SVVM_prog; int i, bodysupercontents; int passedictprog; float pitchsign = 1; @@ -174,7 +177,7 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int // clip to entities // because this uses World_EntitiestoBox, we know all entity boxes overlap // the clip region, so we can skip culling checks in the loop below - numtouchedicts = World_EntitiesInBox(&sv.world, clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts); + numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts); if (numtouchedicts > MAX_EDICTS) { // this never happens @@ -213,16 +216,16 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int if ((int) PRVM_serveredictfloat(touch, solid) == SOLID_BSP || type == MOVE_HITMODEL) { model = SV_GetModelFromEdict(touch); - pitchsign = SV_GetPitchSign(touch); + pitchsign = SV_GetPitchSign(prog, touch); } if (model) Matrix4x4_CreateFromQuakeEntity(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2], pitchsign * PRVM_serveredictvector(touch, angles)[0], PRVM_serveredictvector(touch, angles)[1], PRVM_serveredictvector(touch, angles)[2], 1); else 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(touch->priv.server->framegroupblend, touch); + VM_GenerateFrameGroupBlend(prog, touch->priv.server->framegroupblend, touch); VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model); - VM_UpdateEdictSkeleton(touch, model, touch->priv.server->frameblend); + VM_UpdateEdictSkeleton(prog, touch, model, touch->priv.server->frameblend); 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); else @@ -246,6 +249,7 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t pEnd, int type, prvm_edict trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask) #endif { + prvm_prog_t *prog = SVVM_prog; int i, bodysupercontents; int passedictprog; float pitchsign = 1; @@ -340,7 +344,7 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ // clip to entities // because this uses World_EntitiestoBox, we know all entity boxes overlap // the clip region, so we can skip culling checks in the loop below - numtouchedicts = World_EntitiesInBox(&sv.world, clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts); + numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts); if (numtouchedicts > MAX_EDICTS) { // this never happens @@ -379,16 +383,16 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ if ((int) PRVM_serveredictfloat(touch, solid) == SOLID_BSP || type == MOVE_HITMODEL) { model = SV_GetModelFromEdict(touch); - pitchsign = SV_GetPitchSign(touch); + pitchsign = SV_GetPitchSign(prog, touch); } if (model) Matrix4x4_CreateFromQuakeEntity(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2], pitchsign * PRVM_serveredictvector(touch, angles)[0], PRVM_serveredictvector(touch, angles)[1], PRVM_serveredictvector(touch, angles)[2], 1); else 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(touch->priv.server->framegroupblend, touch); + VM_GenerateFrameGroupBlend(prog, touch->priv.server->framegroupblend, touch); VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model); - VM_UpdateEdictSkeleton(touch, model, touch->priv.server->frameblend); + VM_UpdateEdictSkeleton(prog, touch, model, touch->priv.server->frameblend); 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); else @@ -424,6 +428,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co #endif #endif { + prvm_prog_t *prog = SVVM_prog; vec3_t hullmins, hullmaxs; int i, bodysupercontents; int passedictprog; @@ -553,7 +558,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co // clip to entities // because this uses World_EntitiestoBox, we know all entity boxes overlap // the clip region, so we can skip culling checks in the loop below - numtouchedicts = World_EntitiesInBox(&sv.world, clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts); + numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts); if (numtouchedicts > MAX_EDICTS) { // this never happens @@ -592,16 +597,16 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co if ((int) PRVM_serveredictfloat(touch, solid) == SOLID_BSP || type == MOVE_HITMODEL) { model = SV_GetModelFromEdict(touch); - pitchsign = SV_GetPitchSign(touch); + pitchsign = SV_GetPitchSign(prog, touch); } if (model) Matrix4x4_CreateFromQuakeEntity(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2], pitchsign * PRVM_serveredictvector(touch, angles)[0], PRVM_serveredictvector(touch, angles)[1], PRVM_serveredictvector(touch, angles)[2], 1); else 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(touch->priv.server->framegroupblend, touch); + VM_GenerateFrameGroupBlend(prog, touch->priv.server->framegroupblend, touch); VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model); - VM_UpdateEdictSkeleton(touch, model, touch->priv.server->frameblend); + VM_UpdateEdictSkeleton(prog, touch, model, touch->priv.server->frameblend); 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); else @@ -640,6 +645,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co int SV_PointSuperContents(const vec3_t point) { + prvm_prog_t *prog = SVVM_prog; int supercontents = 0; int i; prvm_edict_t *touch; @@ -662,7 +668,7 @@ int SV_PointSuperContents(const vec3_t point) return supercontents; // get list of entities at this point - numtouchedicts = World_EntitiesInBox(&sv.world, point, point, MAX_EDICTS, touchedicts); + numtouchedicts = SV_EntitiesInBox(point, point, MAX_EDICTS, touchedicts); if (numtouchedicts > MAX_EDICTS) { // this never happens @@ -699,8 +705,38 @@ Linking entities into the world culling system =============================================================================== */ +int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_edict_t **resultedicts) +{ + prvm_prog_t *prog = SVVM_prog; + 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); + if (sv_areadebug.integer) + { + int numresultedicts = 0; + int edictindex; + prvm_edict_t *ed; + for (edictindex = 1;edictindex < prog->num_edicts;edictindex++) + { + ed = PRVM_EDICT_NUM(edictindex); + if (!ed->priv.required->free && BoxesOverlap(PRVM_serveredictvector(ed, absmin), PRVM_serveredictvector(ed, absmax), paddedmins, paddedmaxs)) + { + resultedicts[numresultedicts++] = ed; + if (numresultedicts == maxedicts) + break; + } + } + return numresultedicts; + } + else + return World_EntitiesInBox(&sv.world, paddedmins, paddedmaxs, maxedicts, resultedicts); +} + void SV_LinkEdict_TouchAreaGrid_Call(prvm_edict_t *touch, prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(touch); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(ent); PRVM_serverglobalfloat(time) = sv.time; @@ -717,11 +753,12 @@ void SV_LinkEdict_TouchAreaGrid_Call(prvm_edict_t *touch, prvm_edict_t *ent) PRVM_serverglobalfloat(trace_dphitcontents) = 0; PRVM_serverglobalfloat(trace_dphitq3surfaceflags) = 0; PRVM_serverglobalstring(trace_dphittexturename) = 0; - PRVM_ExecuteProgram (PRVM_serveredictfunction(touch, touch), "QC function self.touch is missing"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(touch, touch), "QC function self.touch is missing"); } void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int i, numtouchedicts, old_self, old_other; prvm_edict_t *touch; static prvm_edict_t *touchedicts[MAX_EDICTS]; @@ -737,7 +774,7 @@ void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent) // build a list of edicts to touch, because the link loop can be corrupted // by IncreaseEdicts called during touch functions - numtouchedicts = World_EntitiesInBox(&sv.world, ent->priv.server->areamins, ent->priv.server->areamaxs, MAX_EDICTS, touchedicts); + numtouchedicts = SV_EntitiesInBox(ent->priv.server->areamins, ent->priv.server->areamaxs, MAX_EDICTS, touchedicts); if (numtouchedicts > MAX_EDICTS) { // this never happens @@ -798,6 +835,7 @@ SV_LinkEdict */ void SV_LinkEdict (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; dp_model_t *model; vec3_t mins, maxs; int modelindex; @@ -816,9 +854,9 @@ void SV_LinkEdict (prvm_edict_t *ent) } model = SV_GetModelByIndex(modelindex); - VM_GenerateFrameGroupBlend(ent->priv.server->framegroupblend, ent); + VM_GenerateFrameGroupBlend(prog, ent->priv.server->framegroupblend, ent); VM_FrameBlendFromFrameGroupBlend(ent->priv.server->frameblend, ent->priv.server->framegroupblend, model); - VM_UpdateEdictSkeleton(ent, model, ent->priv.server->frameblend); + VM_UpdateEdictSkeleton(prog, ent, model, ent->priv.server->frameblend); // set the abs box @@ -914,6 +952,7 @@ returns true if the entity is in solid currently */ static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset) { + prvm_prog_t *prog = SVVM_prog; int contents; vec3_t org; trace_t trace; @@ -968,34 +1007,6 @@ static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset) return false; } -/* -================ -SV_CheckAllEnts -================ -*/ -void SV_CheckAllEnts (void) -{ - int e; - prvm_edict_t *check; - - // see if any solid entities are inside the final position - check = PRVM_NEXT_EDICT(prog->edicts); - for (e = 1;e < prog->num_edicts;e++, check = PRVM_NEXT_EDICT(check)) - { - if (check->priv.server->free) - continue; - if (PRVM_serveredictfloat(check, movetype) == MOVETYPE_PUSH - || PRVM_serveredictfloat(check, movetype) == MOVETYPE_NONE - || PRVM_serveredictfloat(check, movetype) == MOVETYPE_FOLLOW - || PRVM_serveredictfloat(check, movetype) == MOVETYPE_NOCLIP - || PRVM_serveredictfloat(check, movetype) == MOVETYPE_FLY_WORLDONLY) - continue; - - if (SV_TestEntityPosition (check, vec3_origin)) - Con_Print("entity in invalid position\n"); - } -} - // DRESK - Support for Entity Contents Transition Event /* ================ @@ -1004,8 +1015,9 @@ SV_CheckContentsTransition returns true if entity had a valid contentstransition function call ================ */ -int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents) +static int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents) { + prvm_prog_t *prog = SVVM_prog; int bValidFunctionCall; // Default Valid Function Call to False @@ -1019,14 +1031,16 @@ int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents) // Assign Valid Function bValidFunctionCall = true; // Prepare Parameters (Original Contents, New Contents) - // Original Contents - PRVM_G_FLOAT(OFS_PARM0) = PRVM_serveredictfloat(ent, watertype); - // New Contents - PRVM_G_FLOAT(OFS_PARM1) = nContents; - // Assign Self - PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + // Original Contents + PRVM_G_FLOAT(OFS_PARM0) = PRVM_serveredictfloat(ent, watertype); + // New Contents + PRVM_G_FLOAT(OFS_PARM1) = nContents; + // Assign Self + PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + // Set Time + PRVM_serverglobalfloat(time) = sv.time; // Execute VM Function - PRVM_ExecuteProgram(PRVM_serveredictfunction(ent, contentstransition), "contentstransition: NULL function"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(ent, contentstransition), "contentstransition: NULL function"); } } @@ -1042,6 +1056,7 @@ SV_CheckVelocity */ void SV_CheckVelocity (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int i; float wishspeed; @@ -1052,12 +1067,12 @@ void SV_CheckVelocity (prvm_edict_t *ent) { if (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(PRVM_serveredictstring(ent, classname))); + 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])) { - Con_Printf("Got a NaN origin on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(PRVM_serveredictstring(ent, classname))); + 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; } } @@ -1089,8 +1104,9 @@ in a frame. Not used for pushmove objects, because they must be exact. Returns false if the entity removed itself. ============= */ -qboolean SV_RunThink (prvm_edict_t *ent) +static qboolean SV_RunThink (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int iterations; // don't let things stay in the past. @@ -1104,7 +1120,7 @@ qboolean SV_RunThink (prvm_edict_t *ent) PRVM_serveredictfloat(ent, nextthink) = 0; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(prog->edicts); - PRVM_ExecuteProgram (PRVM_serveredictfunction(ent, think), "QC function self.think is missing"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(ent, think), "QC function self.think is missing"); // mods often set nextthink to time to cause a think every frame, // we don't want to loop in that case, so exit if the new nextthink is // <= the time the qc was told, also exit if it is past the end of the @@ -1122,30 +1138,30 @@ SV_Impact Two entities have touched, so run their touch functions ================== */ -extern void VM_SetTraceGlobals(const trace_t *trace); -extern sizebuf_t vm_tempstringsbuf; -void SV_Impact (prvm_edict_t *e1, trace_t *trace) +static void SV_Impact (prvm_edict_t *e1, trace_t *trace) { + prvm_prog_t *prog = SVVM_prog; int restorevm_tempstringsbuf_cursize; int old_self, old_other; prvm_edict_t *e2 = (prvm_edict_t *)trace->ent; old_self = PRVM_serverglobaledict(self); old_other = PRVM_serverglobaledict(other); - restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; + restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize; - VM_SetTraceGlobals(trace); + VM_SetTraceGlobals(prog, trace); - PRVM_serverglobalfloat(time) = sv.time; if (!e1->priv.server->free && !e2->priv.server->free && PRVM_serveredictfunction(e1, touch) && PRVM_serveredictfloat(e1, solid) != SOLID_NOT) { + PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(e1); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(e2); - PRVM_ExecuteProgram (PRVM_serveredictfunction(e1, touch), "QC function self.touch is missing"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(e1, touch), "QC function self.touch is missing"); } if (!e1->priv.server->free && !e2->priv.server->free && PRVM_serveredictfunction(e2, touch) && PRVM_serveredictfloat(e2, solid) != SOLID_NOT) { + PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(e2); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(e1); VectorCopy(PRVM_serveredictvector(e2, origin), PRVM_serverglobalvector(trace_endpos)); @@ -1156,12 +1172,12 @@ void SV_Impact (prvm_edict_t *e1, trace_t *trace) PRVM_serverglobalfloat(trace_dphitcontents) = 0; PRVM_serverglobalfloat(trace_dphitq3surfaceflags) = 0; PRVM_serverglobalstring(trace_dphittexturename) = 0; - PRVM_ExecuteProgram (PRVM_serveredictfunction(e2, touch), "QC function self.touch is missing"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(e2, touch), "QC function self.touch is missing"); } PRVM_serverglobaledict(self) = old_self; PRVM_serverglobaledict(other) = old_other; - vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; + prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } @@ -1174,7 +1190,7 @@ returns the blocked flags (1 = floor, 2 = step / wall) ================== */ #define STOP_EPSILON 0.1 -void ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce) +static void ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce) { int i; float backoff; @@ -1206,6 +1222,7 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q #define MAX_CLIP_PLANES 5 static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, float *stepnormal, int hitsupercontentsmask, float stepheight) { + prvm_prog_t *prog = SVVM_prog; int blocked, bumpcount; int i, j, numplanes; float d, time_left, gravity; @@ -1433,6 +1450,7 @@ SV_Gravity */ static float SV_Gravity (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; float ent_gravity; ent_gravity = PRVM_serveredictfloat(ent, gravity); @@ -1452,6 +1470,7 @@ PUSHMOVE static qboolean SV_NudgeOutOfSolid_PivotIsKnownGood(prvm_edict_t *ent, vec3_t pivot) { + prvm_prog_t *prog = SVVM_prog; int bump; trace_t stucktrace; vec3_t stuckorigin; @@ -1532,6 +1551,7 @@ static qboolean SV_NudgeOutOfSolid_PivotIsKnownGood(prvm_edict_t *ent, vec3_t pi static qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int bump; trace_t stucktrace; vec3_t stuckorigin; @@ -1575,11 +1595,11 @@ Returns true if the push did not result in the entity being teleported by QC cod */ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, 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; @@ -1612,8 +1632,7 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q 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); @@ -1631,7 +1650,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; + } } @@ -1641,8 +1674,9 @@ SV_PushMove ============ */ -void SV_PushMove (prvm_edict_t *pusher, float movetime) +static void SV_PushMove (prvm_edict_t *pusher, float movetime) { + prvm_prog_t *prog = SVVM_prog; int i, e, index; int pusherowner, pusherprog; int checkcontents; @@ -1777,7 +1811,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime) if (PRVM_serveredictfloat(pusher, movetype) == MOVETYPE_FAKEPUSH) // Tenebrae's MOVETYPE_PUSH variant that doesn't push... numcheckentities = 0; else // MOVETYPE_PUSH - numcheckentities = World_EntitiesInBox(&sv.world, mins, maxs, MAX_EDICTS, checkentities); + numcheckentities = SV_EntitiesInBox(mins, maxs, MAX_EDICTS, checkentities); for (e = 0;e < numcheckentities;e++) { prvm_edict_t *check = checkentities[e]; @@ -1921,9 +1955,10 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime) // if the pusher has a "blocked" function, call it, otherwise just stay in place until the obstacle is gone if (PRVM_serveredictfunction(pusher, blocked)) { + PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(pusher); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(check); - PRVM_ExecuteProgram (PRVM_serveredictfunction(pusher, blocked), "QC function self.blocked is missing"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(pusher, blocked), "QC function self.blocked is missing"); } break; } @@ -1939,8 +1974,9 @@ SV_Physics_Pusher ================ */ -void SV_Physics_Pusher (prvm_edict_t *ent) +static void SV_Physics_Pusher (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; float thinktime, oldltime, movetime; oldltime = PRVM_serveredictfloat(ent, ltime); @@ -1965,7 +2001,7 @@ void SV_Physics_Pusher (prvm_edict_t *ent) PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(prog->edicts); - PRVM_ExecuteProgram (PRVM_serveredictfunction(ent, think), "QC function self.think is missing"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(ent, think), "QC function self.think is missing"); } } @@ -2003,8 +2039,9 @@ typedef enum unstickresult_e } unstickresult_t; -unstickresult_t SV_UnstickEntityReturnOffset (prvm_edict_t *ent, vec3_t offset) +static unstickresult_t SV_UnstickEntityReturnOffset (prvm_edict_t *ent, vec3_t offset) { + prvm_prog_t *prog = SVVM_prog; int i, maxunstick; // if not stuck in a bmodel, just return @@ -2049,17 +2086,18 @@ unstickresult_t SV_UnstickEntityReturnOffset (prvm_edict_t *ent, vec3_t offset) qboolean SV_UnstickEntity (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; vec3_t offset; switch(SV_UnstickEntityReturnOffset(ent, offset)) { case UNSTICK_GOOD: return true; case UNSTICK_UNSTUCK: - Con_DPrintf("Unstuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(PRVM_serveredictstring(ent, classname)), offset[0], offset[1], offset[2]); + Con_DPrintf("Unstuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname)), offset[0], offset[1], offset[2]); return true; case UNSTICK_STUCK: if (developer_extra.integer) - Con_DPrintf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(PRVM_serveredictstring(ent, classname))); + Con_DPrintf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); return false; default: Con_Printf("SV_UnstickEntityReturnOffset returned a value outside its enum.\n"); @@ -2075,8 +2113,9 @@ 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) +static void SV_CheckStuck (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; vec3_t offset; switch(SV_UnstickEntityReturnOffset(ent, offset)) @@ -2085,18 +2124,18 @@ void SV_CheckStuck (prvm_edict_t *ent) VectorCopy (PRVM_serveredictvector(ent, origin), PRVM_serveredictvector(ent, 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(PRVM_serveredictstring(ent, classname)), offset[0], offset[1], offset[2]); + Con_DPrintf("Unstuck player entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname)), offset[0], offset[1], offset[2]); break; case UNSTICK_STUCK: VectorSubtract(PRVM_serveredictvector(ent, oldorigin), PRVM_serveredictvector(ent, 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(PRVM_serveredictstring(ent, classname))); + Con_DPrintf("Unstuck player entity %i (classname \"%s\") by restoring oldorigin.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); SV_LinkEdict(ent); //SV_LinkEdict_TouchAreaGrid(ent); } else - Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(PRVM_serveredictstring(ent, classname))); + Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); break; default: Con_Printf("SV_UnstickEntityReturnOffset returned a value outside its enum.\n"); @@ -2109,8 +2148,9 @@ void SV_CheckStuck (prvm_edict_t *ent) SV_CheckWater ============= */ -qboolean SV_CheckWater (prvm_edict_t *ent) +static qboolean SV_CheckWater (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int cont; int nNativeContents; vec3_t point; @@ -2160,8 +2200,9 @@ SV_WallFriction ============ */ -void SV_WallFriction (prvm_edict_t *ent, float *stepnormal) +static void SV_WallFriction (prvm_edict_t *ent, float *stepnormal) { + prvm_prog_t *prog = SVVM_prog; float d, i; vec3_t forward, into, side; @@ -2246,8 +2287,9 @@ SV_WalkMove Only used by players ====================== */ -void SV_WalkMove (prvm_edict_t *ent) +static void SV_WalkMove (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int clip; int oldonground; //int originalmove_clip; @@ -2451,8 +2493,9 @@ SV_Physics_Follow Entities that are "stuck" to another entity ============= */ -void SV_Physics_Follow (prvm_edict_t *ent) +static void SV_Physics_Follow (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; vec3_t vf, vr, vu, angles, v; prvm_edict_t *e; @@ -2503,23 +2546,27 @@ SV_CheckWaterTransition ============= */ -void SV_CheckWaterTransition (prvm_edict_t *ent) +static void SV_CheckWaterTransition (prvm_edict_t *ent) { + 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))); if (!PRVM_serveredictfloat(ent, watertype)) { // just spawned here - PRVM_serveredictfloat(ent, watertype) = cont; - PRVM_serveredictfloat(ent, waterlevel) = 1; - return; + if (!sv_gameplayfix_fixedcheckwatertransition.integer) + { + PRVM_serveredictfloat(ent, watertype) = cont; + PRVM_serveredictfloat(ent, waterlevel) = 1; + return; + } } - // DRESK - Support for Entity Contents Transition Event // NOTE: Call here BEFORE updating the watertype below, // and suppress watersplash sound if a valid function // call was made to allow for custom "splash" sounds. - if( !SV_CheckContentsTransition(ent, cont) ) + else if( !SV_CheckContentsTransition(ent, cont) ) { // Contents Transition Function Invalid; Potentially Play Water Sound // check if the entity crossed into or out of water if (sv_sound_watersplash.string && ((PRVM_serveredictfloat(ent, watertype) == CONTENTS_WATER || PRVM_serveredictfloat(ent, watertype) == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME))) @@ -2534,7 +2581,7 @@ void SV_CheckWaterTransition (prvm_edict_t *ent) else { PRVM_serveredictfloat(ent, watertype) = CONTENTS_EMPTY; - PRVM_serveredictfloat(ent, waterlevel) = 0; + PRVM_serveredictfloat(ent, waterlevel) = sv_gameplayfix_fixedcheckwatertransition.integer ? 0 : cont; } } @@ -2548,11 +2595,15 @@ Toss, bounce, and fly movement. When onground, do nothing. void SV_Physics_Toss (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; trace_t trace; vec3_t move; vec_t movetime; int bump; prvm_edict_t *groundentity; + float d, ent_gravity; + float bouncefactor; + float bouncestop; // if onground, return without moving if ((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) @@ -2598,8 +2649,8 @@ void SV_Physics_Toss (prvm_edict_t *ent) for (bump = 0;bump < MAX_CLIP_PLANES && movetime > 0;bump++) { // move origin - VectorScale (PRVM_serveredictvector(ent, velocity), movetime, move); - if(!SV_PushEntity (&trace, ent, move, true, true)) + VectorScale(PRVM_serveredictvector(ent, velocity), movetime, move); + if(!SV_PushEntity(&trace, ent, move, true, true)) return; // teleported if (ent->priv.server->free) return; @@ -2608,7 +2659,7 @@ void SV_Physics_Toss (prvm_edict_t *ent) // try to unstick the entity if (sv_gameplayfix_unstickentities.integer) SV_UnstickEntity(ent); - if(!SV_PushEntity (&trace, ent, move, false, true)) + if(!SV_PushEntity(&trace, ent, move, false, true)) return; // teleported if (ent->priv.server->free) return; @@ -2616,22 +2667,19 @@ void SV_Physics_Toss (prvm_edict_t *ent) if (trace.fraction == 1) break; movetime *= 1 - min(1, trace.fraction); - if (PRVM_serveredictfloat(ent, movetype) == MOVETYPE_BOUNCEMISSILE) + switch((int)PRVM_serveredictfloat(ent, movetype)) { - float bouncefactor; + case MOVETYPE_BOUNCEMISSILE: bouncefactor = PRVM_serveredictfloat(ent, bouncefactor); if (!bouncefactor) bouncefactor = 1.0f; - ClipVelocity (PRVM_serveredictvector(ent, velocity), trace.plane.normal, PRVM_serveredictvector(ent, velocity), 1 + bouncefactor); + ClipVelocity(PRVM_serveredictvector(ent, velocity), trace.plane.normal, PRVM_serveredictvector(ent, velocity), 1 + bouncefactor); PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) & ~FL_ONGROUND; - } - else if (PRVM_serveredictfloat(ent, movetype) == MOVETYPE_BOUNCE) - { - float d, ent_gravity; - float bouncefactor; - float bouncestop; - + if (!sv_gameplayfix_slidemoveprojectiles.integer) + movetime = 0; + break; + case MOVETYPE_BOUNCE: bouncefactor = PRVM_serveredictfloat(ent, bouncefactor); if (!bouncefactor) bouncefactor = 0.5f; @@ -2640,39 +2688,31 @@ void SV_Physics_Toss (prvm_edict_t *ent) if (!bouncestop) bouncestop = 60.0f / 800.0f; - ClipVelocity (PRVM_serveredictvector(ent, velocity), trace.plane.normal, PRVM_serveredictvector(ent, velocity), 1 + bouncefactor); + ClipVelocity(PRVM_serveredictvector(ent, velocity), trace.plane.normal, PRVM_serveredictvector(ent, velocity), 1 + bouncefactor); ent_gravity = PRVM_serveredictfloat(ent, gravity); if (!ent_gravity) ent_gravity = 1.0f; // LordHavoc: fixed grenades not bouncing when fired down a slope if (sv_gameplayfix_grenadebouncedownslopes.integer) + d = fabs(DotProduct(trace.plane.normal, PRVM_serveredictvector(ent, velocity))); + else + d = PRVM_serveredictvector(ent, velocity)[2]; + if (trace.plane.normal[2] > 0.7 && d < sv_gravity.value * bouncestop * ent_gravity) { - d = DotProduct(trace.plane.normal, PRVM_serveredictvector(ent, velocity)); - if (trace.plane.normal[2] > 0.7 && fabs(d) < sv_gravity.value * bouncestop * ent_gravity) - { - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; - PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); - VectorClear (PRVM_serveredictvector(ent, velocity)); - VectorClear (PRVM_serveredictvector(ent, avelocity)); - } - else - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) & ~FL_ONGROUND; + PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; + PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); + VectorClear(PRVM_serveredictvector(ent, velocity)); + VectorClear(PRVM_serveredictvector(ent, avelocity)); + movetime = 0; } else { - if (trace.plane.normal[2] > 0.7 && PRVM_serveredictvector(ent, velocity)[2] < sv_gravity.value * bouncestop * ent_gravity) - { - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; - PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); - VectorClear (PRVM_serveredictvector(ent, velocity)); - VectorClear (PRVM_serveredictvector(ent, avelocity)); - } - else - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) & ~FL_ONGROUND; + PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) & ~FL_ONGROUND; + if (!sv_gameplayfix_slidemoveprojectiles.integer) + movetime = 0; } - } - else - { + break; + default: ClipVelocity (PRVM_serveredictvector(ent, velocity), trace.plane.normal, PRVM_serveredictvector(ent, velocity), 1.0); if (trace.plane.normal[2] > 0.7) { @@ -2685,9 +2725,9 @@ void SV_Physics_Toss (prvm_edict_t *ent) } else PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) & ~FL_ONGROUND; - } - if (!sv_gameplayfix_slidemoveprojectiles.integer || (PRVM_serveredictfloat(ent, movetype) != MOVETYPE_BOUNCE && PRVM_serveredictfloat(ent, movetype) == MOVETYPE_BOUNCEMISSILE) || ((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND)) + movetime = 0; break; + } } // check for in water @@ -2713,8 +2753,9 @@ This is also used for objects that have become still on the ground, but will fall if the floor is pulled out from under them. ============= */ -void SV_Physics_Step (prvm_edict_t *ent) +static void SV_Physics_Step (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; int flags = (int)PRVM_serveredictfloat(ent, flags); // DRESK @@ -2756,14 +2797,16 @@ void SV_Physics_Step (prvm_edict_t *ent) if(PRVM_serveredictfunction(ent, movetypesteplandevent)) { // Valid Function; Execute // Prepare Parameters - // Assign Velocity at Impact - PRVM_G_VECTOR(OFS_PARM0)[0] = backupVelocity[0]; - PRVM_G_VECTOR(OFS_PARM0)[1] = backupVelocity[1]; - PRVM_G_VECTOR(OFS_PARM0)[2] = backupVelocity[2]; - // Assign Self - PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + // Assign Velocity at Impact + PRVM_G_VECTOR(OFS_PARM0)[0] = backupVelocity[0]; + PRVM_G_VECTOR(OFS_PARM0)[1] = backupVelocity[1]; + PRVM_G_VECTOR(OFS_PARM0)[2] = backupVelocity[2]; + // Assign Self + PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + // Set Time + PRVM_serverglobalfloat(time) = sv.time; // Execute VM Function - PRVM_ExecuteProgram(PRVM_serveredictfunction(ent, movetypesteplandevent), "movetypesteplandevent: NULL function"); + prog->ExecuteProgram(prog, PRVM_serveredictfunction(ent, movetypesteplandevent), "movetypesteplandevent: NULL function"); } else // Check for Engine Landing Sound @@ -2790,6 +2833,7 @@ void SV_Physics_Step (prvm_edict_t *ent) static void SV_Physics_Entity (prvm_edict_t *ent) { + prvm_prog_t *prog = SVVM_prog; // 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 @@ -2855,6 +2899,7 @@ static void SV_Physics_Entity (prvm_edict_t *ent) void SV_Physics_ClientMove(void) { + prvm_prog_t *prog = SVVM_prog; prvm_edict_t *ent; ent = host_client->edict; @@ -2866,7 +2911,7 @@ void SV_Physics_ClientMove(void) PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobalfloat(frametime) = 0; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); - PRVM_ExecuteProgram (PRVM_serverfunction(PlayerPreThink), "QC function PlayerPreThink is missing"); + prog->ExecuteProgram(prog, PRVM_serverfunction(PlayerPreThink), "QC function PlayerPreThink is missing"); PRVM_serverglobalfloat(frametime) = sv.frametime; // make sure the velocity is sane (not a NaN) @@ -2879,7 +2924,7 @@ void SV_Physics_ClientMove(void) PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobalfloat(frametime) = 0; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); - PRVM_ExecuteProgram (PRVM_serverfunction(PlayerPostThink), "QC function PlayerPostThink is missing"); + prog->ExecuteProgram(prog, PRVM_serverfunction(PlayerPostThink), "QC function PlayerPostThink is missing"); PRVM_serverglobalfloat(frametime) = sv.frametime; if(PRVM_serveredictfloat(ent, fixangle)) @@ -2896,6 +2941,7 @@ void SV_Physics_ClientMove(void) 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) return; @@ -2916,7 +2962,7 @@ static void SV_Physics_ClientEntity_PreThink(prvm_edict_t *ent) // call standard client pre-think PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); - PRVM_ExecuteProgram(PRVM_serverfunction(PlayerPreThink), "QC function PlayerPreThink is missing"); + prog->ExecuteProgram(prog, PRVM_serverfunction(PlayerPreThink), "QC function PlayerPreThink is missing"); // make sure the velocity is still sane (not a NaN) SV_CheckVelocity(ent); @@ -2924,6 +2970,7 @@ static void SV_Physics_ClientEntity_PreThink(prvm_edict_t *ent) 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) return; @@ -2934,7 +2981,7 @@ static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent) // call standard player post-think PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); - PRVM_ExecuteProgram(PRVM_serverfunction(PlayerPostThink), "QC function PlayerPostThink is missing"); + prog->ExecuteProgram(prog, PRVM_serverfunction(PlayerPostThink), "QC function PlayerPostThink is missing"); // make sure the velocity is still sane (not a NaN) SV_CheckVelocity(ent); @@ -2960,6 +3007,7 @@ static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent) 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) { @@ -3036,6 +3084,7 @@ SV_Physics */ void SV_Physics (void) { + prvm_prog_t *prog = SVVM_prog; int i; prvm_edict_t *ent; @@ -3044,7 +3093,7 @@ void SV_Physics (void) PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(prog->edicts); PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobalfloat(frametime) = sv.frametime; - PRVM_ExecuteProgram (PRVM_serverfunction(StartFrame), "QC function StartFrame is missing"); + prog->ExecuteProgram(prog, PRVM_serverfunction(StartFrame), "QC function StartFrame is missing"); // run physics engine World_Physics_Frame(&sv.world, sv.frametime, sv_gravity.value); @@ -3111,11 +3160,11 @@ void SV_Physics (void) PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(prog->edicts); PRVM_serverglobaledict(other) = PRVM_EDICT_TO_PROG(prog->edicts); PRVM_serverglobalfloat(time) = sv.time; - PRVM_ExecuteProgram (PRVM_serverfunction(EndFrame), "QC function EndFrame is missing"); + prog->ExecuteProgram(prog, PRVM_serverfunction(EndFrame), "QC function EndFrame is missing"); } // decrement prog->num_edicts if the highest number entities died - for (;PRVM_ED_CanAlloc(PRVM_EDICT_NUM(prog->num_edicts - 1));prog->num_edicts--); + for (;PRVM_ED_CanAlloc(prog, PRVM_EDICT_NUM(prog->num_edicts - 1));prog->num_edicts--); if (!sv_freezenonclients.integer) sv.time += sv.frametime;