trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
//Con_Printf("trace %f %f %f : %f : %f %f %f\n", trace.endpos[0], trace.endpos[1], trace.endpos[2], trace.fraction, trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]);
- if (trace.allsolid)
+ /*
+ if (trace.startsolid)
{
// LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
// entity is trapped in another solid
VectorClear(ent->v->velocity);
return 3;
}
+ */
- if (trace.fraction > 0)
+ if (trace.fraction >= 0.001)
{
// actually covered some distance
VectorCopy (trace.endpos, ent->v->origin);
trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
- if (trace.allsolid)
+ /*
+ if (trace.startsolid)
{
// LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
// entity is trapped in another solid
VectorClear(ent->v->velocity);
return 3;
}
+ */
if (trace.fraction > 0)
{
vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org, org2;
int num_moved;
model_t *pushermodel;
- trace_t trace;
switch ((int) pusher->v->solid)
{
|| check->v->absmax[2] <= mins[2])
continue;
- trace = SV_ClipMoveToEntity (pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin);
- if (!trace.startsolid)
+ if (!SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
continue;
}
- if (forward[0] < 0.999f) // quick way to check if any rotation is used
+ if (forward[0] != 1) // quick way to check if any rotation is used
{
VectorSubtract (check->v->origin, pusher->v->origin, org);
org2[0] = DotProduct (org, forward);
// try moving the contacted entity
pusher->v->solid = SOLID_NOT;
- trace = SV_PushEntity (check, move, moveangle);
+ SV_PushEntity (check, move, moveangle);
pusher->v->solid = savesolid; // was SOLID_BSP
// if it is still inside the pusher, block
- if (SV_TestEntityPosition (check))
+ if (SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
{
// try moving the contacted entity a tiny bit further to account for precision errors
pusher->v->solid = SOLID_NOT;
VectorScale(move, 0.1, move);
- trace = SV_PushEntity (check, move, vec3_origin);
+ SV_PushEntity (check, move, vec3_origin);
pusher->v->solid = savesolid;
- if (SV_TestEntityPosition (check))
+ if (SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
{
// still inside pusher, so it's really blocked
pr_global_struct->self = EDICT_TO_PROG(ent);
pr_global_struct->other = EDICT_TO_PROG(sv.edicts);
PR_ExecuteProgram (ent->v->think, "NULL think function");
- if (ent->e->free)
- return;
}
-
}
ent->v->waterlevel = 0;
ent->v->watertype = CONTENTS_EMPTY;
- cont = Mod_PointContents(point, sv.worldmodel);
+ cont = SV_PointQ1Contents(point);
if (cont <= CONTENTS_WATER)
{
ent->v->watertype = cont;
ent->v->waterlevel = 1;
point[2] = ent->v->origin[2] + (ent->v->mins[2] + ent->v->maxs[2])*0.5;
- cont = Mod_PointContents(point, sv.worldmodel);
+ cont = SV_PointQ1Contents(point);
if (cont <= CONTENTS_WATER)
{
ent->v->waterlevel = 2;
point[2] = ent->v->origin[2] + ent->v->view_ofs[2];
- cont = Mod_PointContents(point, sv.worldmodel);
+ cont = SV_PointQ1Contents(point);
if (cont <= CONTENTS_WATER)
ent->v->waterlevel = 3;
}
vec3_t forward, into, side;
AngleVectors (ent->v->v_angle, forward, NULL, NULL);
- d = DotProduct (stepnormal, forward);
-
- d += 0.5;
- if (d >= 0)
- return;
-
- // cut the tangential velocity
- i = DotProduct (stepnormal, ent->v->velocity);
- VectorScale (stepnormal, i, into);
- VectorSubtract (ent->v->velocity, into, side);
-
- ent->v->velocity[0] = side[0] * (1 + d);
- ent->v->velocity[1] = side[1] * (1 + d);
+ if ((d = DotProduct (stepnormal, forward) + 0.5) < 0)
+ {
+ // cut the tangential velocity
+ i = DotProduct (stepnormal, ent->v->velocity);
+ VectorScale (stepnormal, i, into);
+ VectorSubtract (ent->v->velocity, into, side);
+ ent->v->velocity[0] = side[0] * (1 + d);
+ ent->v->velocity[1] = side[1] * (1 + d);
+ }
}
/*
if (fabs(oldorg[1] - ent->v->origin[1]) > 4
|| fabs(oldorg[0] - ent->v->origin[0]) > 4)
+ {
+ Con_DPrintf("TryUnstick - success.\n");
return clip;
+ }
// go back to the original pos and try again
VectorCopy (oldorg, ent->v->origin);
// still not moving
VectorClear (ent->v->velocity);
+ Con_DPrintf("TryUnstick - failure.\n");
return 7;
}
vec3_t upmove, downmove, oldorg, oldvel, nosteporg, nostepvel, stepnormal;
trace_t downtrace;
+ SV_CheckVelocity(ent);
+
// do a regular slide move unless it looks like you ran into a step
oldonground = (int)ent->v->flags & FL_ONGROUND;
ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
clip = SV_FlyMove (ent, sv.frametime, NULL);
+ SV_CheckVelocity(ent);
+
// if move didn't block on a step, return
if ( !(clip & 2) )
return;
return;
}
- if (sv_nostep.integer)
- return;
+ SV_CheckVelocity(ent);
- if ( (int)ent->v->flags & FL_WATERJUMP )
+ if (sv_nostep.integer || (int)ent->v->flags & FL_WATERJUMP )
return;
VectorCopy (ent->v->origin, nosteporg);
VectorCopy (nosteporg, ent->v->origin);
VectorCopy (nostepvel, ent->v->velocity);
}
+
+ SV_CheckVelocity(ent);
}
//============================================================================
SV_LinkEdict (ent, true);
}
-/*
-=============
-SV_Physics_Noclip
-
-A moving object that doesn't obey physics
-=============
-*/
-void SV_Physics_Noclip (edict_t *ent)
-{
- // regular thinking
- if (!SV_RunThink (ent))
- return;
-
- VectorMA (ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles);
- VectorMA (ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin);
-
- SV_LinkEdict (ent, false);
-}
-
/*
==============================================================================
void SV_CheckWaterTransition (edict_t *ent)
{
int cont;
- cont = Mod_PointContents(ent->v->origin, sv.worldmodel);
+ cont = SV_PointQ1Contents(ent->v->origin);
if (!ent->v->watertype)
{
// just spawned here
return;
}
+ // check if the entity crossed into or out of water
+ if ((ent->v->watertype == CONTENTS_WATER || ent->v->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME))
+ SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
+
if (cont <= CONTENTS_WATER)
{
- if (ent->v->watertype == CONTENTS_EMPTY && cont != CONTENTS_LAVA)
- // just crossed into water
- SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
-
ent->v->watertype = cont;
ent->v->waterlevel = 1;
}
else
{
- if (ent->v->watertype != CONTENTS_EMPTY && ent->v->watertype != CONTENTS_LAVA)
- // just crossed into water
- SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
-
ent->v->watertype = CONTENTS_EMPTY;
- ent->v->waterlevel = cont;
+ ent->v->waterlevel = 0;
}
}
// if onground, return without moving
if ((int)ent->v->flags & FL_ONGROUND)
{
- VectorClear(ent->v->velocity);
if (ent->v->groundentity == 0)
return;
// if ent was supported by a brush model on previous frame,
*/
void SV_Physics_Step (edict_t *ent)
{
- int flags, fall, hitsound;
-
- // freefall if not fly/swim
- fall = true;
- flags = (int)ent->v->flags;
- if (flags & (FL_FLY | FL_SWIM))
- {
- if (flags & FL_FLY)
- fall = false;
- else if ((flags & FL_SWIM) && Mod_PointContents(ent->v->origin, sv.worldmodel) != CONTENTS_EMPTY)
- fall = false;
- }
- if (fall && (flags & FL_ONGROUND) && ent->v->groundentity == 0)
- fall = false;
-
- if (fall)
+ // freefall if not onground/fly/swim
+ if (!((int)ent->v->flags & (FL_ONGROUND | FL_FLY | FL_SWIM)))
{
- if (ent->v->velocity[2] < sv_gravity.value*-0.1)
- {
- hitsound = true;
- if (flags & FL_ONGROUND)
- hitsound = false;
- }
- else
- hitsound = false;
+ int hitsound = ent->v->velocity[2] < sv_gravity.value * -0.1;
- SV_AddGravity (ent);
- SV_CheckVelocity (ent);
- SV_FlyMove (ent, sv.frametime, NULL);
- SV_LinkEdict (ent, false);
+ SV_AddGravity(ent);
+ SV_CheckVelocity(ent);
+ SV_FlyMove(ent, sv.frametime, NULL);
+ SV_LinkEdict(ent, true);
// just hit ground
- if ((int)ent->v->flags & FL_ONGROUND)
- {
- VectorClear(ent->v->velocity);
- if (hitsound)
- SV_StartSound (ent, 0, "demon/dland2.wav", 255, 1);
- }
+ if (hitsound && (int)ent->v->flags & FL_ONGROUND)
+ SV_StartSound(ent, 0, "demon/dland2.wav", 255, 1);
}
// regular thinking
- SV_RunThink (ent);
+ SV_RunThink(ent);
- SV_CheckWaterTransition (ent);
+ SV_CheckWaterTransition(ent);
}
//============================================================================
if (i > 0 && i <= svs.maxclients)
{
- if (!svs.clients[i-1].active)
+ if (!svs.clients[i-1].spawned)
continue;
// connected slot
// call standard client pre-think
SV_Physics_Follow (ent);
break;
case MOVETYPE_NOCLIP:
- if (i > 0 && i <= svs.maxclients)
+ if (SV_RunThink(ent))
{
- if (SV_RunThink (ent))
- {
- SV_CheckWater (ent);
- VectorMA (ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin);
- VectorMA (ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles);
- }
+ SV_CheckWater(ent);
+ VectorMA(ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin);
+ VectorMA(ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles);
}
- else
- SV_Physics_Noclip (ent);
+ // relink normal entities here, players always get relinked so don't relink twice
+ if (!(i > 0 && i <= svs.maxclients))
+ SV_LinkEdict(ent, false);
break;
case MOVETYPE_STEP:
SV_Physics_Step (ent);
SV_AddGravity (ent);
SV_CheckStuck (ent);
SV_WalkMove (ent);
- SV_LinkEdict (ent, true);
+ // relink normal entities here, players always get relinked so don't relink twice
+ if (!(i > 0 && i <= svs.maxclients))
+ SV_LinkEdict (ent, true);
}
break;
case MOVETYPE_TOSS:
projects / xonotic / darkplaces.git / blobdiff