cvar_t sv_wallfriction = {CVAR_NOTIFY, "sv_wallfriction", "1"};
cvar_t sv_newflymove = {CVAR_NOTIFY, "sv_newflymove", "0"};
cvar_t sv_freezenonclients = {CVAR_NOTIFY, "sv_freezenonclients", "0"};
+cvar_t sv_playerphysicsqc = {CVAR_NOTIFY, "sv_playerphysicsqc", "1"};
#define MOVE_EPSILON 0.01
Cvar_RegisterVariable(&sv_wallfriction);
Cvar_RegisterVariable(&sv_newflymove);
Cvar_RegisterVariable(&sv_freezenonclients);
+
+ Cvar_RegisterVariable(&sv_playerphysicsqc);
}
/*
}
if (!trace.ent)
- Host_Error("SV_FlyMove: !trace.ent");
+ {
+ Con_Printf ("SV_FlyMove: !trace.ent");
+ trace.ent = prog->edicts;
+ }
if (((int) ent->fields.server->flags & FL_ONGROUND) && ent->fields.server->groundentity == PRVM_EDICT_TO_PROG(trace.ent))
impact = false;
// run the impact function
if (impact)
{
- SV_Impact(ent, trace.ent);
+ SV_Impact(ent, (prvm_edict_t *)trace.ent);
// break if removed by the impact function
if (ent->priv.server->free)
return blocked;
}
-int SV_SetOnGround (prvm_edict_t *ent)
-{
- vec3_t end;
- trace_t trace;
- if ((int)ent->fields.server->flags & FL_ONGROUND)
- return 1;
- VectorSet(end, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2] - 1);
- trace = SV_Move(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent);
- if (trace.fraction < 1 && trace.plane.normal[2] >= 0.7)
- {
- ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
- ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
- return 1;
- }
- return 0;
-}
-
/*
============
SV_AddGravity
SV_LinkEdict (ent, true);
if (trace.ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent)))
- SV_Impact (ent, trace.ent);
+ SV_Impact (ent, (prvm_edict_t *)trace.ent);
return trace;
}
============
*/
-trace_t SV_ClipMoveToEntity (prvm_edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end);
void SV_PushMove (prvm_edict_t *pusher, float movetime)
{
int i, e, index;
- prvm_edict_t *check, *ed;
float savesolid, movetime2, pushltime;
- vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org, org2;
+ vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org;
int num_moved;
int numcheckentities;
static prvm_edict_t *checkentities[MAX_EDICTS];
VectorCopy (pusher->fields.server->angles, pushang);
pushltime = pusher->fields.server->ltime;
-// move the pusher to it's final position
+// move the pusher to its final position
VectorMA (pusher->fields.server->origin, movetime, pusher->fields.server->velocity, pusher->fields.server->origin);
VectorMA (pusher->fields.server->angles, movetime, pusher->fields.server->avelocity, pusher->fields.server->angles);
numcheckentities = SV_EntitiesInBox(mins, maxs, MAX_EDICTS, checkentities);
for (e = 0;e < numcheckentities;e++)
{
- check = checkentities[e];
- if (check->fields.server->movetype == MOVETYPE_PUSH
- || check->fields.server->movetype == MOVETYPE_NONE
+ prvm_edict_t *check = checkentities[e];
+ if (check->fields.server->movetype == MOVETYPE_NONE
+ || check->fields.server->movetype == MOVETYPE_PUSH
|| check->fields.server->movetype == MOVETYPE_FOLLOW
|| check->fields.server->movetype == MOVETYPE_NOCLIP
|| check->fields.server->movetype == MOVETYPE_FAKEPUSH)
// if the entity is standing on the pusher, it will definitely be moved
if (!(((int)check->fields.server->flags & FL_ONGROUND) && PRVM_PROG_TO_EDICT(check->fields.server->groundentity) == pusher))
- if (!SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin).startsolid)
+ {
+ // if the entity is not inside the pusher's final position, leave it alone
+ if (!SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID).startsolid)
continue;
+ // remove the onground flag for non-players
+ if (check->fields.server->movetype != MOVETYPE_WALK)
+ check->fields.server->flags = (int)check->fields.server->flags & ~FL_ONGROUND;
+ }
+
if (forward[0] != 1 || left[1] != 1) // quick way to check if any rotation is used
{
+ vec3_t org2;
VectorSubtract (check->fields.server->origin, pusher->fields.server->origin, org);
org2[0] = DotProduct (org, forward);
org2[1] = DotProduct (org, left);
else
VectorCopy (move1, move);
- // remove the onground flag for non-players
- if (check->fields.server->movetype != MOVETYPE_WALK)
- check->fields.server->flags = (int)check->fields.server->flags & ~FL_ONGROUND;
-
VectorCopy (check->fields.server->origin, check->priv.server->moved_from);
VectorCopy (check->fields.server->angles, check->priv.server->moved_fromangles);
sv.moved_edicts[num_moved++] = check;
pusher->fields.server->solid = savesolid; // was SOLID_BSP
// if it is still inside the pusher, block
- if (SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin).startsolid)
+ if (SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID).startsolid)
{
// try moving the contacted entity a tiny bit further to account for precision errors
+ vec3_t move2;
pusher->fields.server->solid = SOLID_NOT;
- VectorScale(move, 0.1, move);
- SV_PushEntity (check, move);
+ VectorScale(move, 1.1, move2);
+ VectorCopy (check->priv.server->moved_from, check->fields.server->origin);
+ VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
+ SV_PushEntity (check, move2);
pusher->fields.server->solid = savesolid;
- if (SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin).startsolid)
+ if (SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID).startsolid)
{
- // still inside pusher, so it's really blocked
-
- // fail the move
- if (check->fields.server->mins[0] == check->fields.server->maxs[0])
- continue;
- if (check->fields.server->solid == SOLID_NOT || check->fields.server->solid == SOLID_TRIGGER)
+ // try moving the contacted entity a tiny bit less to account for precision errors
+ pusher->fields.server->solid = SOLID_NOT;
+ VectorScale(move, 0.9, move2);
+ VectorCopy (check->priv.server->moved_from, check->fields.server->origin);
+ VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
+ SV_PushEntity (check, move2);
+ pusher->fields.server->solid = savesolid;
+ if (SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID).startsolid)
{
- // corpse
- check->fields.server->mins[0] = check->fields.server->mins[1] = 0;
- VectorCopy (check->fields.server->mins, check->fields.server->maxs);
- continue;
- }
+ // still inside pusher, so it's really blocked
- VectorCopy (pushorig, pusher->fields.server->origin);
- VectorCopy (pushang, pusher->fields.server->angles);
- pusher->fields.server->ltime = pushltime;
- SV_LinkEdict (pusher, false);
+ // fail the move
+ if (check->fields.server->mins[0] == check->fields.server->maxs[0])
+ continue;
+ if (check->fields.server->solid == SOLID_NOT || check->fields.server->solid == SOLID_TRIGGER)
+ {
+ // corpse
+ check->fields.server->mins[0] = check->fields.server->mins[1] = 0;
+ VectorCopy (check->fields.server->mins, check->fields.server->maxs);
+ continue;
+ }
- // move back any entities we already moved
- for (i = 0;i < num_moved;i++)
- {
- ed = sv.moved_edicts[i];
- VectorCopy (ed->priv.server->moved_from, ed->fields.server->origin);
- VectorCopy (ed->priv.server->moved_fromangles, ed->fields.server->angles);
- SV_LinkEdict (ed, false);
- }
+ VectorCopy (pushorig, pusher->fields.server->origin);
+ VectorCopy (pushang, pusher->fields.server->angles);
+ pusher->fields.server->ltime = pushltime;
+ SV_LinkEdict (pusher, false);
- // if the pusher has a "blocked" function, call it, otherwise just stay in place until the obstacle is gone
- if (pusher->fields.server->blocked)
- {
- prog->globals.server->self = PRVM_EDICT_TO_PROG(pusher);
- prog->globals.server->other = PRVM_EDICT_TO_PROG(check);
- PRVM_ExecuteProgram (pusher->fields.server->blocked, "QC function self.blocked is missing");
+ // move back any entities we already moved
+ for (i = 0;i < num_moved;i++)
+ {
+ prvm_edict_t *ed = sv.moved_edicts[i];
+ VectorCopy (ed->priv.server->moved_from, ed->fields.server->origin);
+ VectorCopy (ed->priv.server->moved_fromangles, ed->fields.server->angles);
+ SV_LinkEdict (ed, false);
+ }
+
+ // if the pusher has a "blocked" function, call it, otherwise just stay in place until the obstacle is gone
+ if (pusher->fields.server->blocked)
+ {
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(pusher);
+ prog->globals.server->other = PRVM_EDICT_TO_PROG(check);
+ PRVM_ExecuteProgram (pusher->fields.server->blocked, "QC function self.blocked is missing");
+ }
+ break;
}
- break;
}
}
}
clip = SV_FlyMove (ent, sv.frametime, NULL);
- SV_SetOnGround (ent);
SV_CheckVelocity(ent);
VectorCopy(ent->fields.server->origin, originalmove_origin);
ent->fields.server->groundentity = originalmove_groundentity;
}
- SV_SetOnGround (ent);
SV_CheckVelocity(ent);
}
}
// check if the entity crossed into or out of water
- if ((ent->fields.server->watertype == CONTENTS_WATER || ent->fields.server->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME))
+ if (gamemode != GAME_NEXUIZ && ((ent->fields.server->watertype == CONTENTS_WATER || ent->fields.server->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME)))
SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
if (cont <= CONTENTS_WATER)
int i = ent - prog->edicts;
if (i >= 1 && i <= svs.maxclients)
{
- // apply the latest accepted move to the entity fields
- SV_ApplyClientMove();
// make sure the velocity is sane (not a NaN)
SV_CheckVelocity(ent);
// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
- if (SV_PlayerPhysicsQC)
+ if (SV_PlayerPhysicsQC && sv_playerphysicsqc.integer)
{
prog->globals.server->time = sv.time;
prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
}
break;
default:
- Host_Error ("SV_Physics: bad movetype %i", (int)ent->fields.server->movetype);
+ Con_Printf ("SV_Physics: bad movetype %i", (int)ent->fields.server->movetype);
break;
}
projects / xonotic / darkplaces.git / blobdiff