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.worldmodel->PointContents(sv.worldmodel, 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.worldmodel->PointContents(sv.worldmodel, 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.worldmodel->PointContents(sv.worldmodel, 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);
+ }
}
/*
}
}
-
-/*
-================
-SV_Physics_Client
-
-Player character actions
-================
-*/
-void SV_Physics_Client (edict_t *ent, int num)
-{
- if (!svs.clients[num-1].active)
- return; // unconnected slot
-
- SV_CheckVelocity (ent);
-
- // call standard client pre-think
- pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(ent);
- PR_ExecuteProgram (pr_global_struct->PlayerPreThink, "QC function PlayerPreThink is missing");
-
- // do a move
- SV_CheckVelocity (ent);
-
- // decide which move function to call
- switch ((int)ent->v->movetype)
- {
- case MOVETYPE_NONE:
- if (!SV_RunThink (ent))
- return;
- break;
-
- case MOVETYPE_WALK:
- if (!SV_RunThink (ent))
- return;
- if (!SV_CheckWater (ent) && ! ((int)ent->v->flags & FL_WATERJUMP) )
- SV_AddGravity (ent);
- SV_CheckStuck (ent);
- SV_WalkMove (ent);
- break;
-
- case MOVETYPE_TOSS:
- case MOVETYPE_BOUNCE:
- SV_Physics_Toss (ent);
- break;
-
- case MOVETYPE_FLY:
- if (!SV_RunThink (ent))
- return;
- SV_CheckWater (ent);
- //SV_FlyMove (ent, sv.frametime, NULL);
- SV_WalkMove (ent);
- break;
-
- case MOVETYPE_NOCLIP:
- if (!SV_RunThink (ent))
- return;
- 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);
- break;
-
- default:
- Host_Error ("SV_Physics_client: bad movetype %i", (int)ent->v->movetype);
- }
-
- SV_CheckVelocity (ent);
-
- // call standard player post-think
- SV_LinkEdict (ent, true);
-
- SV_CheckVelocity (ent);
-
- pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(ent);
- PR_ExecuteProgram (pr_global_struct->PlayerPostThink, "QC function PlayerPostThink is missing");
-}
-
//============================================================================
/*
void SV_CheckWaterTransition (edict_t *ent)
{
int cont;
- cont = Mod_PointContents(ent->v->origin, sv.worldmodel);
+ cont = sv.worldmodel->PointContents(sv.worldmodel, ent->v->origin);
if (!ent->v->watertype)
{
// just spawned here
// 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))
+ // freefall if not onground/fly/swim
+ if (!((int)ent->v->flags & (FL_ONGROUND | 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)
- {
- 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, false);
// 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)
{
- SV_Physics_Client (ent, i);
- continue;
+ if (!svs.clients[i-1].active)
+ continue;
+ // connected slot
+ // call standard client pre-think
+ SV_CheckVelocity (ent);
+ pr_global_struct->time = sv.time;
+ pr_global_struct->self = EDICT_TO_PROG(ent);
+ PR_ExecuteProgram (pr_global_struct->PlayerPreThink, "QC function PlayerPreThink is missing");
+ SV_CheckVelocity (ent);
}
+ // LordHavoc: merged client and normal entity physics
switch ((int) ent->v->movetype)
{
case MOVETYPE_PUSH:
SV_Physics_Follow (ent);
break;
case MOVETYPE_NOCLIP:
- SV_Physics_Noclip (ent);
+ if (i > 0 && i <= svs.maxclients)
+ {
+ 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);
+ }
+ }
+ else
+ SV_Physics_Noclip (ent);
break;
case MOVETYPE_STEP:
SV_Physics_Step (ent);
break;
- // LordHavoc: added support for MOVETYPE_WALK on normal entities! :)
case MOVETYPE_WALK:
if (SV_RunThink (ent))
{
case MOVETYPE_TOSS:
case MOVETYPE_BOUNCE:
case MOVETYPE_BOUNCEMISSILE:
- case MOVETYPE_FLY:
case MOVETYPE_FLYMISSILE:
SV_Physics_Toss (ent);
break;
+ case MOVETYPE_FLY:
+ if (i > 0 && i <= svs.maxclients)
+ {
+ if (SV_RunThink (ent))
+ {
+ SV_CheckWater (ent);
+ SV_WalkMove (ent);
+ }
+ }
+ else
+ SV_Physics_Toss (ent);
+ break;
default:
Host_Error ("SV_Physics: bad movetype %i", (int)ent->v->movetype);
break;
}
+
+ if (i > 0 && i <= svs.maxclients && !ent->e->free)
+ {
+ SV_CheckVelocity (ent);
+
+ // call standard player post-think
+ SV_LinkEdict (ent, true);
+
+ SV_CheckVelocity (ent);
+
+ pr_global_struct->time = sv.time;
+ pr_global_struct->self = EDICT_TO_PROG(ent);
+ PR_ExecuteProgram (pr_global_struct->PlayerPostThink, "QC function PlayerPostThink is missing");
+ }
}
if (pr_global_struct->force_retouch)
projects / xonotic / darkplaces.git / blobdiff