Collision_Init();
}
-typedef struct
-{
- // bounding box of entire move area
- vec3_t boxmins, boxmaxs;
-
- // size of the moving object
- vec3_t mins, maxs;
-
- // size when clipping against monsters
- vec3_t mins2, maxs2;
-
- // start and end origin of move
- vec3_t start, end;
-
- // trace results
- trace_t trace;
-
- // type of move (like ignoring monsters, or similar)
- int type;
-
- // the edict that is moving (if any)
- edict_t *passedict;
-}
-moveclip_t;
-
//============================================================================
// ClearLink is used for new headnodes
typedef struct areagrid_s
{
- link_t trigger_edicts;
- link_t solid_edicts;
+ link_t edicts;
}
areagrid_t;
void SV_CreateAreaGrid (vec3_t mins, vec3_t maxs)
{
int i;
- ClearLink (&sv_areagrid_outside.trigger_edicts);
- ClearLink (&sv_areagrid_outside.solid_edicts);
+ ClearLink (&sv_areagrid_outside.edicts);
// choose either the world box size, or a larger box to ensure the grid isn't too fine
sv_areagrid_size[0] = max(maxs[0] - mins[0], AREA_GRID * sv_areagrid_mingridsize.value);
sv_areagrid_size[1] = max(maxs[1] - mins[1], AREA_GRID * sv_areagrid_mingridsize.value);
sv_areagrid_scale[2] = AREA_GRID / sv_areagrid_size[2];
for (i = 0;i < AREA_GRIDNODES;i++)
{
- ClearLink (&sv_areagrid[i].trigger_edicts);
- ClearLink (&sv_areagrid[i].solid_edicts);
+ ClearLink (&sv_areagrid[i].edicts);
}
Con_DPrintf("sv_areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, sv_areagrid_mins[0], sv_areagrid_mins[1], sv_areagrid_mins[2], sv_areagrid_maxs[0], sv_areagrid_maxs[1], sv_areagrid_maxs[2], sv_areagrid_size[0], sv_areagrid_size[1], sv_areagrid_size[2], 1.0f / sv_areagrid_scale[0], 1.0f / sv_areagrid_scale[1], 1.0f / sv_areagrid_scale[2], sv_areagrid_mingridsize.value);
}
===============
*/
-void SV_UnlinkEdict (edict_t *ent)
+void SV_UnlinkEdict (prvm_edict_t *ent)
{
int i;
for (i = 0;i < ENTITYGRIDAREAS;i++)
{
- if (ent->e->areagrid[i].prev)
+ if (ent->priv.server->areagrid[i].prev)
{
- RemoveLink (&ent->e->areagrid[i]);
- ent->e->areagrid[i].prev = ent->e->areagrid[i].next = NULL;
+ RemoveLink (&ent->priv.server->areagrid[i]);
+ ent->priv.server->areagrid[i].prev = ent->priv.server->areagrid[i].next = NULL;
}
}
}
-
-void SV_TouchAreaGrid(edict_t *ent)
+int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list)
{
- link_t *l, *next;
- edict_t *touch;
+ int numlist;
areagrid_t *grid;
- int old_self, old_other, igrid[3], igridmins[3], igridmaxs[3];
+ link_t *l;
+ prvm_edict_t *ent;
+ int igrid[3], igridmins[3], igridmaxs[3];
+ sv_areagrid_stats_calls++;
sv_areagrid_marknumber++;
- igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
- //igridmins[2] = (int) ((ent->v->absmin[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
- igridmaxs[0] = (int) ((ent->v->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) ((ent->v->absmax[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
- //igridmaxs[2] = (int) ((ent->v->absmax[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
+ igridmins[0] = (int) ((mins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+ igridmins[1] = (int) ((mins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
+ //igridmins[2] = (int) ((mins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
+ igridmaxs[0] = (int) ((maxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+ igridmaxs[1] = (int) ((maxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
+ //igridmaxs[2] = (int) ((maxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
igridmins[0] = max(0, igridmins[0]);
igridmins[1] = max(0, igridmins[1]);
//igridmins[2] = max(0, igridmins[2]);
igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
//igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
- for (l = sv_areagrid_outside.trigger_edicts.next;l != &sv_areagrid_outside.trigger_edicts;l = next)
+ numlist = 0;
+ // add entities not linked into areagrid because they are too big or
+ // outside the grid bounds
+ if (sv_areagrid_outside.edicts.next != &sv_areagrid_outside.edicts)
{
- next = l->next;
- touch = EDICT_NUM(l->entitynumber);
- if (ent->v->absmin[0] > touch->v->absmax[0]
- || ent->v->absmax[0] < touch->v->absmin[0]
- || ent->v->absmin[1] > touch->v->absmax[1]
- || ent->v->absmax[1] < touch->v->absmin[1]
- || ent->v->absmin[2] > touch->v->absmax[2]
- || ent->v->absmax[2] < touch->v->absmin[2])
- continue;
- if (touch == ent)
- continue;
- if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER)
- continue;
- old_self = pr_global_struct->self;
- old_other = pr_global_struct->other;
-
- pr_global_struct->self = EDICT_TO_PROG(touch);
- pr_global_struct->other = EDICT_TO_PROG(ent);
- pr_global_struct->time = sv.time;
- PR_ExecuteProgram (touch->v->touch, "");
-
- pr_global_struct->self = old_self;
- pr_global_struct->other = old_other;
+ for (l = sv_areagrid_outside.edicts.next;l != &sv_areagrid_outside.edicts;l = l->next)
+ {
+ ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != sv_areagrid_marknumber)
+ {
+ ent->priv.server->areagridmarknumber = sv_areagrid_marknumber;
+ if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax))
+ {
+ if (numlist < maxlist)
+ list[numlist] = ent;
+ numlist++;
+ }
+ sv_areagrid_stats_entitychecks++;
+ }
+ }
}
-
+ // add grid linked entities
for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
{
- for (l = grid->trigger_edicts.next;l != &grid->trigger_edicts;l = next)
+ if (grid->edicts.next != &grid->edicts)
{
- next = l->next;
- touch = EDICT_NUM(l->entitynumber);
- if (touch->e->areagridmarknumber == sv_areagrid_marknumber)
- continue;
- touch->e->areagridmarknumber = sv_areagrid_marknumber;
- if (ent->v->absmin[0] > touch->v->absmax[0]
- || ent->v->absmax[0] < touch->v->absmin[0]
- || ent->v->absmin[1] > touch->v->absmax[1]
- || ent->v->absmax[1] < touch->v->absmin[1]
- || ent->v->absmin[2] > touch->v->absmax[2]
- || ent->v->absmax[2] < touch->v->absmin[2])
- continue;
- // LordHavoc: id bug that won't be fixed: triggers do not ignore their owner like solid objects do
- if (touch == ent)
- continue;
- if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER)
- continue;
- old_self = pr_global_struct->self;
- old_other = pr_global_struct->other;
-
- pr_global_struct->self = EDICT_TO_PROG(touch);
- pr_global_struct->other = EDICT_TO_PROG(ent);
- pr_global_struct->time = sv.time;
- PR_ExecuteProgram (touch->v->touch, "");
-
- pr_global_struct->self = old_self;
- pr_global_struct->other = old_other;
+ for (l = grid->edicts.next;l != &grid->edicts;l = l->next)
+ {
+ ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != sv_areagrid_marknumber)
+ {
+ ent->priv.server->areagridmarknumber = sv_areagrid_marknumber;
+ if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax))
+ {
+ if (numlist < maxlist)
+ list[numlist] = ent;
+ numlist++;
+ }
+ }
+ sv_areagrid_stats_entitychecks++;
+ }
}
}
}
+ return numlist;
+}
+
+void SV_TouchAreaGrid(prvm_edict_t *ent)
+{
+ int i, numtouchedicts, old_self, old_other;
+ prvm_edict_t *touch, *touchedicts[MAX_EDICTS];
+
+ // build a list of edicts to touch, because the link loop can be corrupted
+ // by SV_IncreaseEdicts called during touch functions
+ numtouchedicts = SV_EntitiesInBox(ent->fields.server->absmin, ent->fields.server->absmax, MAX_EDICTS, touchedicts);
+ if (numtouchedicts > MAX_EDICTS)
+ {
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
+ }
+
+ old_self = prog->globals.server->self;
+ old_other = prog->globals.server->other;
+ for (i = 0;i < numtouchedicts;i++)
+ {
+ touch = touchedicts[i];
+ if (touch != ent && (int)touch->fields.server->solid == SOLID_TRIGGER && touch->fields.server->touch)
+ {
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(touch);
+ prog->globals.server->other = PRVM_EDICT_TO_PROG(ent);
+ prog->globals.server->time = sv.time;
+ PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
+ }
+ }
+ prog->globals.server->self = old_self;
+ prog->globals.server->other = old_other;
}
-void SV_LinkEdict_AreaGrid(edict_t *ent)
+void SV_LinkEdict_AreaGrid(prvm_edict_t *ent)
{
areagrid_t *grid;
- int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = NUM_FOR_EDICT(ent);
+ int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = PRVM_NUM_FOR_EDICT(ent);
- if (entitynumber <= 0 || entitynumber >= sv.max_edicts || EDICT_NUM(entitynumber) != ent)
- Host_Error("SV_LinkEdict_AreaGrid: invalid edict %p (sv.edicts is %p, edict compared to sv.edicts is %i)\n", ent, sv.edicts, entitynumber);
+ if (entitynumber <= 0 || entitynumber >= prog->max_edicts || PRVM_EDICT_NUM(entitynumber) != ent)
+ {
+ Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", ent, prog->edicts, entitynumber);
+ return;
+ }
- igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
- //igridmins[2] = (int) ((ent->v->absmin[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
- igridmaxs[0] = (int) ((ent->v->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) ((ent->v->absmax[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
- //igridmaxs[2] = (int) ((ent->v->absmax[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
+ igridmins[0] = (int) ((ent->fields.server->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+ igridmins[1] = (int) ((ent->fields.server->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
+ //igridmins[2] = (int) ((ent->fields.server->absmin[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
+ igridmaxs[0] = (int) ((ent->fields.server->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+ igridmaxs[1] = (int) ((ent->fields.server->absmax[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
+ //igridmaxs[2] = (int) ((ent->fields.server->absmax[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
if (igridmins[0] < 0 || igridmaxs[0] > AREA_GRID || igridmins[1] < 0 || igridmaxs[1] > AREA_GRID || ((igridmaxs[0] - igridmins[0]) * (igridmaxs[1] - igridmins[1])) > ENTITYGRIDAREAS)
{
// wow, something outside the grid, store it as such
- if (ent->v->solid == SOLID_TRIGGER)
- InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.trigger_edicts, entitynumber);
- else
- InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.solid_edicts, entitynumber);
+ InsertLinkBefore (&ent->priv.server->areagrid[0], &sv_areagrid_outside.edicts, entitynumber);
return;
}
{
grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
- {
- if (ent->v->solid == SOLID_TRIGGER)
- InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->trigger_edicts, entitynumber);
- else
- InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->solid_edicts, entitynumber);
- }
+ InsertLinkBefore (&ent->priv.server->areagrid[gridnum], &grid->edicts, entitynumber);
}
}
===============
*/
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
+void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
{
model_t *model;
- if (ent->e->areagrid[0].prev)
+ if (ent->priv.server->areagrid[0].prev)
SV_UnlinkEdict (ent); // unlink from old position
- if (ent == sv.edicts)
+ if (ent == prog->edicts)
return; // don't add the world
- if (ent->e->free)
+ if (ent->priv.server->free)
return;
// set the abs box
- if (ent->v->solid == SOLID_BSP)
+ if (ent->fields.server->solid == SOLID_BSP)
{
- if (ent->v->modelindex < 0 || ent->v->modelindex > MAX_MODELS)
- Host_Error("SOLID_BSP with invalid modelindex!\n");
- model = sv.models[(int) ent->v->modelindex];
+ int modelindex = ent->fields.server->modelindex;
+ if (modelindex < 0 || modelindex > MAX_MODELS)
+ {
+ Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
+ modelindex = 0;
+ }
+ model = sv.models[modelindex];
if (model != NULL)
{
Mod_CheckLoaded(model);
if (!model->TraceBox)
- Host_Error("SOLID_BSP with non-collidable model\n");
+ Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
- if (ent->v->angles[0] || ent->v->angles[2] || ent->v->avelocity[0] || ent->v->avelocity[2])
+ if (ent->fields.server->angles[0] || ent->fields.server->angles[2] || ent->fields.server->avelocity[0] || ent->fields.server->avelocity[2])
{
- VectorAdd(ent->v->origin, model->rotatedmins, ent->v->absmin);
- VectorAdd(ent->v->origin, model->rotatedmaxs, ent->v->absmax);
+ VectorAdd(ent->fields.server->origin, model->rotatedmins, ent->fields.server->absmin);
+ VectorAdd(ent->fields.server->origin, model->rotatedmaxs, ent->fields.server->absmax);
}
- else if (ent->v->angles[1] || ent->v->avelocity[1])
+ else if (ent->fields.server->angles[1] || ent->fields.server->avelocity[1])
{
- VectorAdd(ent->v->origin, model->yawmins, ent->v->absmin);
- VectorAdd(ent->v->origin, model->yawmaxs, ent->v->absmax);
+ VectorAdd(ent->fields.server->origin, model->yawmins, ent->fields.server->absmin);
+ VectorAdd(ent->fields.server->origin, model->yawmaxs, ent->fields.server->absmax);
}
else
{
- VectorAdd(ent->v->origin, model->normalmins, ent->v->absmin);
- VectorAdd(ent->v->origin, model->normalmaxs, ent->v->absmax);
+ VectorAdd(ent->fields.server->origin, model->normalmins, ent->fields.server->absmin);
+ VectorAdd(ent->fields.server->origin, model->normalmaxs, ent->fields.server->absmax);
}
}
else
{
// SOLID_BSP with no model is valid, mainly because some QC setup code does so temporarily
- VectorAdd(ent->v->origin, ent->v->mins, ent->v->absmin);
- VectorAdd(ent->v->origin, ent->v->maxs, ent->v->absmax);
+ VectorAdd(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->absmin);
+ VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, ent->fields.server->absmax);
}
}
else
{
- VectorAdd(ent->v->origin, ent->v->mins, ent->v->absmin);
- VectorAdd(ent->v->origin, ent->v->maxs, ent->v->absmax);
+ VectorAdd(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->absmin);
+ VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, ent->fields.server->absmax);
}
//
// to make items easier to pick up and allow them to be grabbed off
// of shelves, the abs sizes are expanded
//
- if ((int)ent->v->flags & FL_ITEM)
+ if ((int)ent->fields.server->flags & FL_ITEM)
{
- ent->v->absmin[0] -= 15;
- ent->v->absmin[1] -= 15;
- ent->v->absmin[2] -= 1;
- ent->v->absmax[0] += 15;
- ent->v->absmax[1] += 15;
- ent->v->absmax[2] += 1;
+ ent->fields.server->absmin[0] -= 15;
+ ent->fields.server->absmin[1] -= 15;
+ ent->fields.server->absmin[2] -= 1;
+ ent->fields.server->absmax[0] += 15;
+ ent->fields.server->absmax[1] += 15;
+ ent->fields.server->absmax[2] += 1;
}
else
{
// because movement is clipped an epsilon away from an actual edge,
// we must fully check even when bounding boxes don't quite touch
- ent->v->absmin[0] -= 1;
- ent->v->absmin[1] -= 1;
- ent->v->absmin[2] -= 1;
- ent->v->absmax[0] += 1;
- ent->v->absmax[1] += 1;
- ent->v->absmax[2] += 1;
+ ent->fields.server->absmin[0] -= 1;
+ ent->fields.server->absmin[1] -= 1;
+ ent->fields.server->absmin[2] -= 1;
+ ent->fields.server->absmax[0] += 1;
+ ent->fields.server->absmax[1] += 1;
+ ent->fields.server->absmax[2] += 1;
}
- if (ent->v->solid == SOLID_NOT)
+ if (ent->fields.server->solid == SOLID_NOT)
return;
SV_LinkEdict_AreaGrid(ent);
This could be a lot more efficient...
============
*/
-int SV_TestEntityPosition (edict_t *ent)
+int SV_TestEntityPosition (prvm_edict_t *ent)
{
- return SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, ent->v->origin, MOVE_NORMAL, ent).startsolid;
+ return SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NORMAL, ent).startsolid;
}
eventually rotation) of the end points
==================
*/
-trace_t SV_ClipMoveToEntity(edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype)
+trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
{
- int i;
trace_t trace;
model_t *model = NULL;
matrix4x4_t matrix, imatrix;
float tempnormal[3], starttransformed[3], endtransformed[3];
float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
- if ((int) ent->v->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
+ memset(&trace, 0, sizeof(trace));
+ trace.fraction = trace.realfraction = 1;
+ VectorCopy(end, trace.endpos);
+
+ if ((int) ent->fields.server->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
{
- i = ent->v->modelindex;
+ unsigned int modelindex = ent->fields.server->modelindex;
// if the modelindex is 0, it shouldn't be SOLID_BSP!
- if (i == 0)
+ if (modelindex == 0)
{
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with no model\n", NUM_FOR_EDICT(ent));
- memset(&trace, 0, sizeof(trace));
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with no model\n", PRVM_NUM_FOR_EDICT(ent));
return trace;
}
- if ((unsigned int) i >= MAX_MODELS)
+ if (modelindex >= MAX_MODELS)
{
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", NUM_FOR_EDICT(ent));
- memset(&trace, 0, sizeof(trace));
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
return trace;
}
- model = sv.models[i];
- if (i != 0 && model == NULL)
+ model = sv.models[modelindex];
+ if (modelindex != 0 && model == NULL)
{
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", NUM_FOR_EDICT(ent));
- memset(&trace, 0, sizeof(trace));
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
return trace;
}
Mod_CheckLoaded(model);
- if ((int) ent->v->solid == SOLID_BSP)
+ if ((int) ent->fields.server->solid == SOLID_BSP)
{
if (!model->TraceBox)
{
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with a non-collidable model\n", NUM_FOR_EDICT(ent));
- memset(&trace, 0, sizeof(trace));
- return trace;
- }
- if (ent->v->movetype != MOVETYPE_PUSH)
- {
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP without MOVETYPE_PUSH\n", NUM_FOR_EDICT(ent));
- memset(&trace, 0, sizeof(trace));
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with a non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
return trace;
}
+ //if ((int) ent->fields.server->movetype != MOVETYPE_PUSH)
+ //{
+ // Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP without MOVETYPE_PUSH\n", PRVM_NUM_FOR_EDICT(ent));
+ // return trace;
+ //}
}
- Matrix4x4_CreateFromQuakeEntity(&matrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], 1);
+ Matrix4x4_CreateFromQuakeEntity(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2], ent->fields.server->angles[0], ent->fields.server->angles[1], ent->fields.server->angles[2], 1);
}
else
- Matrix4x4_CreateTranslate(&matrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2]);
+ Matrix4x4_CreateTranslate(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
Matrix4x4_Invert_Simple(&imatrix, &matrix);
Matrix4x4_Transform(&imatrix, start, starttransformed);
if (model && model->TraceBox)
{
int frame;
- frame = (int)ent->v->frame;
+ frame = (int)ent->fields.server->frame;
frame = bound(0, frame, (model->numframes - 1));
VectorAdd(starttransformed, maxs, starttransformedmaxs);
VectorAdd(endtransformed, maxs, endtransformedmaxs);
VectorAdd(starttransformed, mins, starttransformedmins);
VectorAdd(endtransformed, mins, endtransformedmins);
- model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, SUPERCONTENTS_SOLID);
+ model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
}
else
- Collision_ClipTrace_Box(&trace, ent->v->mins, ent->v->maxs, starttransformed, mins, maxs, endtransformed, SUPERCONTENTS_SOLID, SUPERCONTENTS_SOLID);
+ Collision_ClipTrace_Box(&trace, ent->fields.server->mins, ent->fields.server->maxs, starttransformed, mins, maxs, endtransformed, hitsupercontents, SUPERCONTENTS_SOLID);
+ trace.fraction = bound(0, trace.fraction, 1);
+ trace.realfraction = bound(0, trace.realfraction, 1);
if (trace.fraction < 1)
{
//===========================================================================
-void SV_ClipToNode(moveclip_t *clip, link_t *list)
-{
- link_t *l, *next;
- edict_t *touch;
- trace_t trace;
-
- sv_areagrid_stats_nodechecks++;
- for (l = list->next;l != list;l = next)
- {
- next = l->next;
- touch = EDICT_NUM(l->entitynumber);
- if (touch->e->areagridmarknumber == sv_areagrid_marknumber)
- continue;
- touch->e->areagridmarknumber = sv_areagrid_marknumber;
- sv_areagrid_stats_entitychecks++;
-
- // LordHavoc: this box comparison isn't much use with the high resolution areagrid
- /*
- if (clip->boxmins[0] > touch->v->absmax[0]
- || clip->boxmaxs[0] < touch->v->absmin[0]
- || clip->boxmins[1] > touch->v->absmax[1]
- || clip->boxmaxs[1] < touch->v->absmin[1]
- || clip->boxmins[2] > touch->v->absmax[2]
- || clip->boxmaxs[2] < touch->v->absmin[2])
- continue;
- */
-
- if (clip->type == MOVE_NOMONSTERS && touch->v->solid != SOLID_BSP)
- continue;
-
- if (touch->v->solid == SOLID_NOT)
- continue;
-
- if (clip->passedict)
- {
- if (touch == clip->passedict)
- continue;
- if (!clip->passedict->v->size[0] && !touch->v->size[0])
- continue; // points never interact
- if (PROG_TO_EDICT(touch->v->owner) == clip->passedict)
- continue; // don't clip against own missiles
- if (PROG_TO_EDICT(clip->passedict->v->owner) == touch)
- continue; // don't clip against owner
- // LordHavoc: corpse code
- if (clip->passedict->v->solid == SOLID_CORPSE && (touch->v->solid == SOLID_SLIDEBOX || touch->v->solid == SOLID_CORPSE))
- continue;
- if (clip->passedict->v->solid == SOLID_SLIDEBOX && touch->v->solid == SOLID_CORPSE)
- continue;
- }
-
- if (touch->v->solid == SOLID_TRIGGER)
- {
- ED_Print(touch);
- Host_Error ("Trigger in clipping list");
- }
-
- // might interact, so do an exact clip
- if ((int)touch->v->flags & FL_MONSTER)
- trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins2, clip->maxs2, clip->end, clip->type);
- else
- trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins, clip->maxs, clip->end, clip->type);
- // LordHavoc: take the 'best' answers from the new trace and combine with existing data
- if (trace.allsolid)
- clip->trace.allsolid = true;
- if (trace.startsolid)
- {
- clip->trace.startsolid = true;
- if (clip->trace.realfraction == 1)
- clip->trace.ent = touch;
- }
- if (trace.inopen)
- clip->trace.inopen = true;
- if (trace.inwater)
- clip->trace.inwater = true;
- if (trace.realfraction < clip->trace.realfraction)
- {
- clip->trace.fraction = trace.fraction;
- clip->trace.realfraction = trace.realfraction;
- VectorCopy(trace.endpos, clip->trace.endpos);
- clip->trace.plane = trace.plane;
- clip->trace.ent = touch;
- }
- clip->trace.startsupercontents |= trace.startsupercontents;
- }
-}
-
/*
==================
SV_Move
==================
*/
#if COLLISIONPARANOID >= 1
-trace_t SV_Move_(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
+trace_t SV_Move_(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict)
#else
-trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict)
#endif
{
- moveclip_t clip;
vec3_t hullmins, hullmaxs;
- areagrid_t *grid;
- int i, igrid[3], igridmins[3], igridmaxs[3];
-
- memset(&clip, 0, sizeof(moveclip_t));
-
- VectorCopy(start, clip.start);
- VectorCopy(end, clip.end);
- VectorCopy(mins, clip.mins);
- VectorCopy(maxs, clip.maxs);
- VectorCopy(mins, clip.mins2);
- VectorCopy(maxs, clip.maxs2);
- clip.type = type;
- clip.passedict = passedict;
+ int i;
+ int hitsupercontentsmask;
+ int passedictprog;
+ qboolean pointtrace;
+ prvm_edict_t *traceowner, *touch;
+ trace_t trace;
+ // bounding box of entire move area
+ vec3_t clipboxmins, clipboxmaxs;
+ // size of the moving object
+ vec3_t clipmins, clipmaxs;
+ // size when clipping against monsters
+ vec3_t clipmins2, clipmaxs2;
+ // start and end origin of move
+ vec3_t clipstart, clipend;
+ // trace results
+ trace_t cliptrace;
+ int numtouchedicts;
+ prvm_edict_t *touchedicts[MAX_EDICTS];
+
+ VectorCopy(start, clipstart);
+ VectorCopy(end, clipend);
+ VectorCopy(mins, clipmins);
+ VectorCopy(maxs, clipmaxs);
+ VectorCopy(mins, clipmins2);
+ VectorCopy(maxs, clipmaxs2);
#if COLLISIONPARANOID >= 3
- Con_Printf("move(%f %f %f,%f %f %f)", clip.start[0], clip.start[1], clip.start[2], clip.end[0], clip.end[1], clip.end[2]);
+ Con_Printf("move(%f %f %f,%f %f %f)", clipstart[0], clipstart[1], clipstart[2], clipend[0], clipend[1], clipend[2]);
#endif
+ hitsupercontentsmask = SUPERCONTENTS_SOLID;
+ if (passedict)
+ {
+ if (passedict->fields.server->solid == SOLID_SLIDEBOX)
+ hitsupercontentsmask |= SUPERCONTENTS_PLAYERCLIP;
+ if ((int)passedict->fields.server->flags & FL_MONSTER)
+ hitsupercontentsmask |= SUPERCONTENTS_MONSTERCLIP;
+ }
+
// clip to world
- clip.trace = SV_ClipMoveToEntity(sv.edicts, clip.start, clip.mins, clip.maxs, clip.end, clip.type);
- if (clip.trace.startsolid || clip.trace.fraction < 1)
- clip.trace.ent = sv.edicts;
- if (clip.type == MOVE_WORLDONLY)
- return clip.trace;
+ cliptrace = SV_ClipMoveToEntity(prog->edicts, clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
+ if (cliptrace.startsolid || cliptrace.fraction < 1)
+ cliptrace.ent = prog->edicts;
+ if (type == MOVE_WORLDONLY)
+ return cliptrace;
- if (clip.type == MOVE_MISSILE)
+ if (type == MOVE_MISSILE)
{
// LordHavoc: modified this, was = -15, now -= 15
for (i = 0;i < 3;i++)
{
- clip.mins2[i] -= 15;
- clip.maxs2[i] += 15;
+ clipmins2[i] -= 15;
+ clipmaxs2[i] += 15;
}
}
// get adjusted box for bmodel collisions if the world is q1bsp or hlbsp
if (sv.worldmodel && sv.worldmodel->brush.RoundUpToHullSize)
- sv.worldmodel->brush.RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, hullmins, hullmaxs);
+ sv.worldmodel->brush.RoundUpToHullSize(sv.worldmodel, clipmins, clipmaxs, hullmins, hullmaxs);
else
{
- VectorCopy(clip.mins, hullmins);
- VectorCopy(clip.maxs, hullmaxs);
+ VectorCopy(clipmins, hullmins);
+ VectorCopy(clipmaxs, hullmaxs);
}
// create the bounding box of the entire move
for (i = 0;i < 3;i++)
{
- clip.boxmins[i] = min(clip.start[i], clip.trace.endpos[i]) + min(hullmins[i], clip.mins2[i]) - 1;
- clip.boxmaxs[i] = max(clip.start[i], clip.trace.endpos[i]) + max(hullmaxs[i], clip.maxs2[i]) + 1;
+ clipboxmins[i] = min(clipstart[i], cliptrace.endpos[i]) + min(hullmins[i], clipmins2[i]) - 1;
+ clipboxmaxs[i] = max(clipstart[i], cliptrace.endpos[i]) + max(hullmaxs[i], clipmaxs2[i]) + 1;
}
// debug override to test against everything
if (sv_debugmove.integer)
{
- clip.boxmins[0] = clip.boxmins[1] = clip.boxmins[2] = -999999999;
- clip.boxmaxs[0] = clip.boxmaxs[1] = clip.boxmaxs[2] = 999999999;
+ clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+ clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = 999999999;
}
+ // if the passedict is world, make it NULL (to avoid two checks each time)
+ if (passedict == prog->edicts)
+ passedict = NULL;
+ // precalculate prog value for passedict for comparisons
+ passedictprog = PRVM_EDICT_TO_PROG(passedict);
+ // figure out whether this is a point trace for comparisons
+ pointtrace = VectorCompare(clipmins, clipmaxs);
+ // precalculate passedict's owner edict pointer for comparisons
+ traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.server->owner) : 0;
+
// clip to enttiies
- sv_areagrid_stats_calls++;
- sv_areagrid_marknumber++;
- igridmins[0] = (int) ((clip.boxmins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) ((clip.boxmins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
- //igridmins[2] = (int) ((clip->boxmins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
- igridmaxs[0] = (int) ((clip.boxmaxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) ((clip.boxmaxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
- //igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
- igridmins[0] = max(0, igridmins[0]);
- igridmins[1] = max(0, igridmins[1]);
- //igridmins[2] = max(0, igridmins[2]);
- igridmaxs[0] = min(AREA_GRID, igridmaxs[0]);
- igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
- //igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
+ numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
+ if (numtouchedicts > MAX_EDICTS)
+ {
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
+ }
+ for (i = 0;i < numtouchedicts;i++)
+ {
+ touch = touchedicts[i];
- if (sv_areagrid_outside.solid_edicts.next != &sv_areagrid_outside.solid_edicts)
- SV_ClipToNode(&clip, &sv_areagrid_outside.solid_edicts);
+ if (touch->fields.server->solid < SOLID_BBOX)
+ continue;
+ if (type == MOVE_NOMONSTERS && touch->fields.server->solid != SOLID_BSP)
+ continue;
- for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
- for (grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0], igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
- if (grid->solid_edicts.next != &grid->solid_edicts)
- SV_ClipToNode(&clip, &grid->solid_edicts);
+ if (passedict)
+ {
+ // don't clip against self
+ if (passedict == touch)
+ continue;
+ // don't clip owned entities against owner
+ if (traceowner == touch)
+ continue;
+ // don't clip owner against owned entities
+ if (passedictprog == touch->fields.server->owner)
+ continue;
+ // don't clip points against points (they can't collide)
+ if (pointtrace && VectorCompare(touch->fields.server->mins, touch->fields.server->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.server->flags & FL_MONSTER)))
+ continue;
+ // don't clip corpse against character
+ if (passedict->fields.server->solid == SOLID_CORPSE && (touch->fields.server->solid == SOLID_SLIDEBOX || touch->fields.server->solid == SOLID_CORPSE))
+ continue;
+ // don't clip character against corpse
+ if (passedict->fields.server->solid == SOLID_SLIDEBOX && touch->fields.server->solid == SOLID_CORPSE)
+ continue;
+ }
+
+ // might interact, so do an exact clip
+ if ((int)touch->fields.server->flags & FL_MONSTER)
+ trace = SV_ClipMoveToEntity(touch, clipstart, clipmins2, clipmaxs2, clipend, type, hitsupercontentsmask);
+ else
+ trace = SV_ClipMoveToEntity(touch, clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
+ // LordHavoc: take the 'best' answers from the new trace and combine with existing data
+ if (trace.allsolid)
+ cliptrace.allsolid = true;
+ if (trace.startsolid)
+ {
+ cliptrace.startsolid = true;
+ if (cliptrace.realfraction == 1)
+ cliptrace.ent = touch;
+ }
+ // don't set this except on the world, because it can easily confuse
+ // monsters underwater if there's a bmodel involved in the trace
+ // (inopen && inwater is how they check water visibility)
+ //if (trace.inopen)
+ // cliptrace.inopen = true;
+ if (trace.inwater)
+ cliptrace.inwater = true;
+ if (trace.realfraction < cliptrace.realfraction)
+ {
+ cliptrace.fraction = trace.fraction;
+ cliptrace.realfraction = trace.realfraction;
+ VectorCopy(trace.endpos, cliptrace.endpos);
+ cliptrace.plane = trace.plane;
+ cliptrace.ent = touch;
+ }
+ cliptrace.startsupercontents |= trace.startsupercontents;
+ }
- return clip.trace;
+ return cliptrace;
}
#if COLLISIONPARANOID >= 1
-trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict)
{
int endstuck;
trace_t trace;
#if COLLISIONPARANOID < 3
if (trace.startsolid || endstuck)
#endif
- Con_Printf("%s{e%i:%f %f %f:%f %f %f:%f:%f %f %f%s%s}\n", (trace.startsolid || endstuck) ? "\002" : "", passedict ? passedict - sv.edicts : -1, passedict->v->origin[0], passedict->v->origin[1], passedict->v->origin[2], end[0] - passedict->v->origin[0], end[1] - passedict->v->origin[1], end[2] - passedict->v->origin[2], trace.fraction, trace.endpos[0] - passedict->v->origin[0], trace.endpos[1] - passedict->v->origin[1], trace.endpos[2] - passedict->v->origin[2], trace.startsolid ? " startstuck" : "", endstuck ? " endstuck" : "");
+ Con_Printf("%s{e%i:%f %f %f:%f %f %f:%f:%f %f %f%s%s}\n", (trace.startsolid || endstuck) ? "\002" : "", passedict ? passedict - prog->edicts : -1, passedict->fields.server->origin[0], passedict->fields.server->origin[1], passedict->fields.server->origin[2], end[0] - passedict->fields.server->origin[0], end[1] - passedict->fields.server->origin[1], end[2] - passedict->fields.server->origin[2], trace.fraction, trace.endpos[0] - passedict->fields.server->origin[0], trace.endpos[1] - passedict->fields.server->origin[1], trace.endpos[2] - passedict->fields.server->origin[2], trace.startsolid ? " startstuck" : "", endstuck ? " endstuck" : "");
}
return trace;
}
int SV_PointSuperContents(const vec3_t point)
{
- return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents;
+ return SV_Move(point, vec3_origin, vec3_origin, point, sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents;
}
int SV_PointQ1Contents(const vec3_t point)
projects / xonotic / darkplaces.git / blobdiff