#include "quakedef.h"
-edict_t *sv_player;
-
cvar_t sv_edgefriction = {0, "edgefriction", "2"};
cvar_t sv_deltacompress = {0, "sv_deltacompress", "1"};
cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8"};
cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320"};
cvar_t sv_accelerate = {0, "sv_accelerate", "10"};
-static vec3_t forward, right, up;
-
-vec3_t wishdir;
-float wishspeed;
-
-// world
-float *angles;
-float *origin;
-float *velocity;
-
-qboolean onground;
-
-usercmd_t cmd;
+static usercmd_t cmd;
/*
int i, j;
int step, dir, steps;
- if (!((int)sv_player->v->flags & FL_ONGROUND))
+ if (!((int)host_client->edict->v->flags & FL_ONGROUND))
return;
- angleval = sv_player->v->angles[YAW] * M_PI*2 / 360;
+ angleval = host_client->edict->v->angles[YAW] * M_PI*2 / 360;
sinval = sin(angleval);
cosval = cos(angleval);
for (i=0 ; i<MAX_FORWARD ; i++)
{
- top[0] = sv_player->v->origin[0] + cosval*(i+3)*12;
- top[1] = sv_player->v->origin[1] + sinval*(i+3)*12;
- top[2] = sv_player->v->origin[2] + sv_player->v->view_ofs[2];
+ top[0] = host_client->edict->v->origin[0] + cosval*(i+3)*12;
+ top[1] = host_client->edict->v->origin[1] + sinval*(i+3)*12;
+ top[2] = host_client->edict->v->origin[2] + host_client->edict->v->view_ofs[2];
bottom[0] = top[0];
bottom[1] = top[1];
bottom[2] = top[2] - 160;
- tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, sv_player);
+ tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, host_client->edict);
// if looking at a wall, leave ideal the way is was
- if (tr.allsolid)
+ if (tr.startsolid)
return;
// near a dropoff
if (!dir)
{
- sv_player->v->idealpitch = 0;
+ host_client->edict->v->idealpitch = 0;
return;
}
if (steps < 2)
return;
- sv_player->v->idealpitch = -dir * sv_idealpitchscale.value;
+ host_client->edict->v->idealpitch = -dir * sv_idealpitchscale.value;
}
+#if 1
+static vec3_t wishdir, forward, right, up;
+static float wishspeed;
+
+static qboolean onground;
/*
==================
*/
void SV_UserFriction (void)
{
- float *vel, speed, newspeed, control, friction;
+ float speed, newspeed, control, friction;
vec3_t start, stop;
trace_t trace;
- vel = velocity;
-
- speed = sqrt(vel[0]*vel[0] +vel[1]*vel[1]);
+ speed = sqrt(host_client->edict->v->velocity[0]*host_client->edict->v->velocity[0]+host_client->edict->v->velocity[1]*host_client->edict->v->velocity[1]);
if (!speed)
return;
// if the leading edge is over a dropoff, increase friction
- start[0] = stop[0] = origin[0] + vel[0]/speed*16;
- start[1] = stop[1] = origin[1] + vel[1]/speed*16;
- start[2] = origin[2] + sv_player->v->mins[2];
+ start[0] = stop[0] = host_client->edict->v->origin[0] + host_client->edict->v->velocity[0]/speed*16;
+ start[1] = stop[1] = host_client->edict->v->origin[1] + host_client->edict->v->velocity[1]/speed*16;
+ start[2] = host_client->edict->v->origin[2] + host_client->edict->v->mins[2];
stop[2] = start[2] - 34;
- trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, sv_player);
+ trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict);
if (trace.fraction == 1.0)
friction = sv_friction.value*sv_edgefriction.value;
else
newspeed /= speed;
- vel[0] = vel[0] * newspeed;
- vel[1] = vel[1] * newspeed;
- vel[2] = vel[2] * newspeed;
+ VectorScale(host_client->edict->v->velocity, newspeed, host_client->edict->v->velocity);
}
/*
int i;
float addspeed, accelspeed, currentspeed;
- currentspeed = DotProduct (velocity, wishdir);
+ currentspeed = DotProduct (host_client->edict->v->velocity, wishdir);
addspeed = wishspeed - currentspeed;
if (addspeed <= 0)
return;
accelspeed = addspeed;
for (i=0 ; i<3 ; i++)
- velocity[i] += accelspeed*wishdir[i];
+ host_client->edict->v->velocity[i] += accelspeed*wishdir[i];
}
void SV_AirAccelerate (vec3_t wishveloc)
wishspd = VectorNormalizeLength (wishveloc);
if (wishspd > 30)
wishspd = 30;
- currentspeed = DotProduct (velocity, wishveloc);
+ currentspeed = DotProduct (host_client->edict->v->velocity, wishveloc);
addspeed = wishspd - currentspeed;
if (addspeed <= 0)
return;
accelspeed = addspeed;
for (i=0 ; i<3 ; i++)
- velocity[i] += accelspeed*wishveloc[i];
+ host_client->edict->v->velocity[i] += accelspeed*wishveloc[i];
}
float len;
eval_t *val;
- len = VectorNormalizeLength (sv_player->v->punchangle);
+ len = VectorNormalizeLength (host_client->edict->v->punchangle);
len -= 10*sv.frametime;
if (len < 0)
len = 0;
- VectorScale (sv_player->v->punchangle, len, sv_player->v->punchangle);
+ VectorScale (host_client->edict->v->punchangle, len, host_client->edict->v->punchangle);
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_punchvector)))
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_punchvector)))
{
len = VectorNormalizeLength (val->vector);
int i;
float wishspeed;
- AngleVectors (sv_player->v->v_angle, forward, right, up);
+ AngleVectors (host_client->edict->v->v_angle, forward, right, up);
for (i = 0; i < 3; i++)
- velocity[i] = forward[i] * cmd.forwardmove + right[i] * cmd.sidemove;
+ host_client->edict->v->velocity[i] = forward[i] * cmd.forwardmove + right[i] * cmd.sidemove;
- velocity[2] += cmd.upmove;
+ host_client->edict->v->velocity[2] += cmd.upmove;
- wishspeed = VectorLength (velocity);
+ wishspeed = VectorLength(host_client->edict->v->velocity);
if (wishspeed > sv_maxspeed.value)
- {
- VectorScale (velocity, sv_maxspeed.value / wishspeed, velocity);
- wishspeed = sv_maxspeed.value;
- }
+ VectorScale(host_client->edict->v->velocity, sv_maxspeed.value / wishspeed, host_client->edict->v->velocity);
}
/*
float speed, newspeed, wishspeed, addspeed, accelspeed, temp;
// user intentions
- AngleVectors (sv_player->v->v_angle, forward, right, up);
+ AngleVectors (host_client->edict->v->v_angle, forward, right, up);
for (i=0 ; i<3 ; i++)
wishvel[i] = forward[i]*cmd.forwardmove + right[i]*cmd.sidemove;
wishspeed *= 0.7;
// water friction
- speed = VectorLength (velocity);
+ speed = VectorLength(host_client->edict->v->velocity);
if (speed)
{
newspeed = speed - sv.frametime * speed * sv_friction.value;
if (newspeed < 0)
newspeed = 0;
temp = newspeed/speed;
- VectorScale (velocity, temp, velocity);
+ VectorScale(host_client->edict->v->velocity, temp, host_client->edict->v->velocity);
}
else
newspeed = 0;
accelspeed = addspeed;
for (i=0 ; i<3 ; i++)
- velocity[i] += accelspeed * wishvel[i];
+ host_client->edict->v->velocity[i] += accelspeed * wishvel[i];
}
void SV_WaterJump (void)
{
- if (sv.time > sv_player->v->teleport_time || !sv_player->v->waterlevel)
+ if (sv.time > host_client->edict->v->teleport_time || !host_client->edict->v->waterlevel)
{
- sv_player->v->flags = (int)sv_player->v->flags & ~FL_WATERJUMP;
- sv_player->v->teleport_time = 0;
+ host_client->edict->v->flags = (int)host_client->edict->v->flags & ~FL_WATERJUMP;
+ host_client->edict->v->teleport_time = 0;
}
- sv_player->v->velocity[0] = sv_player->v->movedir[0];
- sv_player->v->velocity[1] = sv_player->v->movedir[1];
+ host_client->edict->v->velocity[0] = host_client->edict->v->movedir[0];
+ host_client->edict->v->velocity[1] = host_client->edict->v->movedir[1];
}
// LordHavoc: correct quake movement speed bug when looking up/down
wishvel[0] = wishvel[2] = 0;
- wishvel[1] = sv_player->v->angles[1];
+ wishvel[1] = host_client->edict->v->angles[1];
AngleVectors (wishvel, forward, right, up);
fmove = cmd.forwardmove;
smove = cmd.sidemove;
// hack to not let you back into teleporter
- if (sv.time < sv_player->v->teleport_time && fmove < 0)
+ if (sv.time < host_client->edict->v->teleport_time && fmove < 0)
fmove = 0;
for (i=0 ; i<3 ; i++)
wishvel[i] = forward[i]*fmove + right[i]*smove;
- if ((int)sv_player->v->movetype != MOVETYPE_WALK)
+ if ((int)host_client->edict->v->movetype != MOVETYPE_WALK)
wishvel[2] += cmd.upmove;
VectorCopy (wishvel, wishdir);
wishspeed = sv_maxspeed.value;
}
- if (sv_player->v->movetype == MOVETYPE_NOCLIP)
+ if (host_client->edict->v->movetype == MOVETYPE_NOCLIP)
{
// noclip
- VectorCopy (wishvel, velocity);
+ VectorCopy (wishvel, host_client->edict->v->velocity);
}
else if ( onground )
{
{
vec3_t v_angle;
- if (sv_player->v->movetype == MOVETYPE_NONE)
+ if (host_client->edict->v->movetype == MOVETYPE_NONE)
return;
- onground = (int)sv_player->v->flags & FL_ONGROUND;
-
- origin = sv_player->v->origin;
- velocity = sv_player->v->velocity;
+ onground = (int)host_client->edict->v->flags & FL_ONGROUND;
DropPunchAngle ();
// if dead, behave differently
- if (sv_player->v->health <= 0)
+ if (host_client->edict->v->health <= 0)
return;
- // angles
- // show 1/3 the pitch angle and all the roll angle
cmd = host_client->cmd;
- angles = sv_player->v->angles;
- VectorAdd (sv_player->v->v_angle, sv_player->v->punchangle, v_angle);
- angles[ROLL] = V_CalcRoll (sv_player->v->angles, sv_player->v->velocity)*4;
- if (!sv_player->v->fixangle)
+ // angles
+ // show 1/3 the pitch angle and all the roll angle
+ VectorAdd (host_client->edict->v->v_angle, host_client->edict->v->punchangle, v_angle);
+ host_client->edict->v->angles[ROLL] = V_CalcRoll (host_client->edict->v->angles, host_client->edict->v->velocity)*4;
+ if (!host_client->edict->v->fixangle)
{
- // LordHavoc: pitch was ugly to begin with... removed except in water
- if (sv_player->v->waterlevel >= 2)
- angles[PITCH] = -v_angle[PITCH]/3;
- else
- angles[PITCH] = 0;
- angles[YAW] = v_angle[YAW];
+ host_client->edict->v->angles[PITCH] = -v_angle[PITCH]/3;
+ host_client->edict->v->angles[YAW] = v_angle[YAW];
}
- if ( (int)sv_player->v->flags & FL_WATERJUMP )
+ if ( (int)host_client->edict->v->flags & FL_WATERJUMP )
{
SV_WaterJump ();
return;
}
+ /*
// Player is (somehow) outside of the map, or flying, or noclipping
- if (SV_TestEntityPosition (sv_player)
- || sv_player->v->movetype == MOVETYPE_FLY
- || sv_player->v->movetype == MOVETYPE_NOCLIP)
+ if (host_client->edict->v->movetype != MOVETYPE_NOCLIP && (host_client->edict->v->movetype == MOVETYPE_FLY || SV_TestEntityPosition (host_client->edict)))
+ //if (host_client->edict->v->movetype == MOVETYPE_NOCLIP || host_client->edict->v->movetype == MOVETYPE_FLY || SV_TestEntityPosition (host_client->edict))
{
SV_FreeMove ();
return;
}
+ */
// walk
- if ((sv_player->v->waterlevel >= 2) && (sv_player->v->movetype != MOVETYPE_NOCLIP))
+ if ((host_client->edict->v->waterlevel >= 2) && (host_client->edict->v->movetype != MOVETYPE_NOCLIP))
{
SV_WaterMove ();
return;
SV_AirMove ();
}
+#else
+
+extern cvar_t cl_rollspeed;
+extern cvar_t cl_rollangle;
+void SV_ClientThink(void)
+{
+ int j;
+ vec3_t wishvel, wishdir, v, v_forward, v_right, v_up, start, stop;
+ float wishspeed, f, limit;
+ trace_t trace;
+
+ if (host_client->edict->v->movetype == MOVETYPE_NONE)
+ return;
+
+ f = DotProduct(host_client->edict->v->punchangle, host_client->edict->v->punchangle);
+ if (f)
+ {
+ limit = sqrt(f);
+ f = (limit - 10 * sv.frametime);
+ f /= limit;
+ f = max(0, f);
+ VectorScale(host_client->edict->v->punchangle, f, host_client->edict->v->punchangle);
+ }
+
+ // if dead, behave differently
+ if (host_client->edict->v->health <= 0)
+ return;
+
+ AngleVectors(host_client->edict->v->v_angle, v_forward, v_right, v_up);
+ // show 1/3 the pitch angle and all the roll angle
+ f = DotProduct(host_client->edict->v->velocity, v_right) * (1.0 / cl_rollspeed.value);
+ host_client->edict->v->angles[2] = bound(-1, f, 1) * cl_rollangle.value * 4;
+ if (!host_client->edict->v->fixangle)
+ {
+ host_client->edict->v->angles[0] = (host_client->edict->v->v_angle[0] + host_client->edict->v->punchangle[0]) * -0.333;
+ host_client->edict->v->angles[1] = host_client->edict->v->v_angle[1] + host_client->edict->v->punchangle[1];
+ }
+
+ if ((int)host_client->edict->v->flags & FL_WATERJUMP)
+ {
+ host_client->edict->v->velocity[0] = host_client->edict->v->movedir[0];
+ host_client->edict->v->velocity[1] = host_client->edict->v->movedir[1];
+ if (sv.time > host_client->edict->v->teleport_time || host_client->edict->v->waterlevel == 0)
+ {
+ host_client->edict->v->flags = (int)host_client->edict->v->flags - ((int)host_client->edict->v->flags & FL_WATERJUMP);
+ host_client->edict->v->teleport_time = 0;
+ }
+ return;
+ }
+
+ // swim
+ if (host_client->edict->v->waterlevel >= 2)
+ if (host_client->edict->v->movetype != MOVETYPE_NOCLIP)
+ {
+ if (host_client->cmd.forwardmove == 0 && host_client->cmd.sidemove == 0 && host_client->cmd.upmove == 0)
+ {
+ // drift towards bottom
+ wishvel[0] = 0;
+ wishvel[1] = 0;
+ wishvel[2] = -60;
+ }
+ else
+ {
+ for (j = 0;j < 3;j++)
+ wishvel[j] = v_forward[j] * host_client->cmd.forwardmove + v_right[j] * host_client->cmd.sidemove;
+ wishvel[2] += host_client->cmd.upmove;
+ }
+
+ wishspeed = VectorLength(wishvel);
+ wishspeed = min(wishspeed, sv_maxspeed.value) * 0.7;
+
+ // water friction
+ f = VectorLength(host_client->edict->v->velocity) * (1 - sv.frametime * sv_friction.value);
+ if (f > 0)
+ f /= VectorLength(host_client->edict->v->velocity);
+ else
+ f = 0;
+ VectorScale(host_client->edict->v->velocity, f, host_client->edict->v->velocity);
+
+ // water acceleration
+ if (wishspeed <= f)
+ return;
+
+ f = wishspeed - f;
+ limit = sv_accelerate.value * wishspeed * sv.frametime;
+ if (f > limit)
+ f = limit;
+ limit = VectorLength(wishvel);
+ if (limit)
+ f /= limit;
+ VectorMA(host_client->edict->v->velocity, f, wishvel, host_client->edict->v->velocity);
+ return;
+ }
+
+ // if not flying, move horizontally only
+ if (host_client->edict->v->movetype != MOVETYPE_FLY)
+ {
+ VectorClear(wishvel);
+ wishvel[1] = host_client->edict->v->v_angle[1];
+ AngleVectors(wishvel, v_forward, v_right, v_up);
+ }
+
+ // hack to not let you back into teleporter
+ VectorScale(v_right, host_client->cmd.sidemove, wishvel);
+ if (sv.time >= host_client->edict->v->teleport_time || host_client->cmd.forwardmove > 0)
+ VectorMA(wishvel, host_client->cmd.forwardmove, v_forward, wishvel);
+ if (host_client->edict->v->movetype != MOVETYPE_WALK)
+ wishvel[2] += cmd.upmove;
+
+ VectorCopy(wishvel, wishdir);
+ VectorNormalize(wishdir);
+ wishspeed = VectorLength(wishvel);
+ if (wishspeed > sv_maxspeed.value)
+ wishspeed = sv_maxspeed.value;
+
+ if (host_client->edict->v->movetype == MOVETYPE_NOCLIP || host_client->edict->v->movetype == MOVETYPE_FLY)
+ {
+ VectorScale(wishdir, wishspeed, host_client->edict->v->velocity);
+ return;
+ }
+
+ if ((int)host_client->edict->v->flags & FL_ONGROUND) // walking
+ {
+ // friction
+ f = host_client->edict->v->velocity[0] * host_client->edict->v->velocity[0] + host_client->edict->v->velocity[1] * host_client->edict->v->velocity[1];
+ if (f)
+ {
+ f = sqrt(f);
+ VectorCopy(host_client->edict->v->velocity, v);
+ v[2] = 0;
+
+ // if the leading edge is over a dropoff, increase friction
+ limit = 16.0f / f;
+ VectorMA(host_client->edict->v->origin, limit, v, v);
+ v[2] += host_client->edict->v->mins[2];
+
+ VectorCopy(v, start);
+ VectorCopy(v, stop);
+ stop[2] -= 34;
+ trace = SV_Move(start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict);
+
+ // apply friction
+ if (f < sv_stopspeed.value)
+ f = sv_stopspeed.value / f;
+ else
+ f = 1;
+ if (trace.fraction == 1)
+ f *= sv_edgefriction.value;
+ f = 1 - sv.frametime * f * sv_friction.value;
+
+ if (f < 0)
+ f = 0;
+ VectorScale(host_client->edict->v->velocity, f, host_client->edict->v->velocity);
+ }
+ }
+ else // airborn
+ wishspeed = min(wishspeed, 30);
+
+ // ground or air acceleration
+ f = wishspeed - DotProduct(host_client->edict->v->velocity, wishdir);
+ if (f > 0)
+ {
+ limit = sv_accelerate.value * sv.frametime * wishspeed;
+ if (f > limit)
+ f = limit;
+ VectorMA(host_client->edict->v->velocity, f, wishdir, host_client->edict->v->velocity);
+ }
+}
+#endif
/*
===================
float total;
// read ping time
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = sv.time - MSG_ReadFloat ();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
host_client->num_pings++;
for (i=0, total = 0;i < NUM_PING_TIMES;i++)
total += host_client->ping_times[i];
// can be used for prediction
host_client->ping = total / NUM_PING_TIMES;
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_ping)))
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ping)))
val->_float = host_client->ping * 1000.0;
// read current angles
- // DPPROTOCOL_VERSION4
for (i = 0;i < 3;i++)
- angle[i] = MSG_ReadPreciseAngle();
+ {
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ if (sv.protocol == PROTOCOL_QUAKE)
+ angle[i] = MSG_ReadAngle8i();
+ else if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)
+ angle[i] = MSG_ReadAngle32f();
+ else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+ angle[i] = MSG_ReadAngle16i();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ }
- VectorCopy (angle, sv_player->v->v_angle);
+ VectorCopy (angle, host_client->edict->v->v_angle);
// read movement
- move->forwardmove = MSG_ReadShort ();
- move->sidemove = MSG_ReadShort ();
- move->upmove = MSG_ReadShort ();
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_movement)))
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ move->forwardmove = MSG_ReadCoord16i ();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ move->sidemove = MSG_ReadCoord16i ();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ move->upmove = MSG_ReadCoord16i ();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_movement)))
{
val->vector[0] = move->forwardmove;
val->vector[1] = move->sidemove;
}
// read buttons
- bits = MSG_ReadByte ();
- sv_player->v->button0 = bits & 1;
- sv_player->v->button2 = (bits & 2)>>1;
+ if (sv.protocol == PROTOCOL_DARKPLACES6)
+ bits = MSG_ReadLong ();
+ else
+ bits = MSG_ReadByte ();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ host_client->edict->v->button0 = bits & 1;
+ host_client->edict->v->button2 = (bits & 2)>>1;
// LordHavoc: added 6 new buttons
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_button3))) val->_float = ((bits >> 2) & 1);
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_button4))) val->_float = ((bits >> 3) & 1);
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_button5))) val->_float = ((bits >> 4) & 1);
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_button6))) val->_float = ((bits >> 5) & 1);
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_button7))) val->_float = ((bits >> 6) & 1);
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_button8))) val->_float = ((bits >> 7) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button3))) val->_float = ((bits >> 2) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button4))) val->_float = ((bits >> 3) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button5))) val->_float = ((bits >> 4) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button6))) val->_float = ((bits >> 5) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button7))) val->_float = ((bits >> 6) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button8))) val->_float = ((bits >> 7) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_buttonuse))) val->_float = ((bits >> 8) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_buttonchat))) val->_float = ((bits >> 9) & 1);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_active))) val->_float = ((bits >> 10) & 1);
i = MSG_ReadByte ();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
if (i)
- sv_player->v->impulse = i;
+ host_client->edict->v->impulse = i;
+
+ // PRYDON_CLIENTCURSOR
+ if (sv.protocol == PROTOCOL_DARKPLACES6)
+ {
+ // 30 bytes
+ move->cursor_screen[0] = MSG_ReadShort() * (1.0f / 32767.0f);
+ move->cursor_screen[1] = MSG_ReadShort() * (1.0f / 32767.0f);
+ move->cursor_start[0] = MSG_ReadFloat();
+ move->cursor_start[1] = MSG_ReadFloat();
+ move->cursor_start[2] = MSG_ReadFloat();
+ move->cursor_impact[0] = MSG_ReadFloat();
+ move->cursor_impact[1] = MSG_ReadFloat();
+ move->cursor_impact[2] = MSG_ReadFloat();
+ move->cursor_entitynumber = (unsigned short)MSG_ReadShort();
+ if (move->cursor_entitynumber >= sv.max_edicts)
+ {
+ Con_DPrintf("SV_ReadClientMessage: client send bad cursor_entitynumber\n");
+ move->cursor_entitynumber = 0;
+ }
+ // as requested by FrikaC, cursor_trace_ent is reset to world if the
+ // entity is free at time of receipt
+ if (EDICT_NUM(move->cursor_entitynumber)->e->free)
+ move->cursor_entitynumber = 0;
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ }
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_screen))) VectorCopy(move->cursor_screen, val->vector);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_start))) VectorCopy(move->cursor_start, val->vector);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_ent))) val->edict = EDICT_TO_PROG(EDICT_NUM(move->cursor_entitynumber));
+}
+
+void SV_FrameLost(int framenum)
+{
+ if (host_client->entitydatabase5)
+ EntityFrame5_LostFrame(host_client->entitydatabase5, framenum, host_client - svs.clients + 1);
+}
+
+void SV_FrameAck(int framenum)
+{
+ if (host_client->entitydatabase)
+ EntityFrame_AckFrame(host_client->entitydatabase, framenum);
+ else if (host_client->entitydatabase4)
+ EntityFrame4_AckFrame(host_client->entitydatabase4, framenum, true);
+ else if (host_client->entitydatabase5)
+ EntityFrame5_AckFrame(host_client->entitydatabase5, framenum);
}
/*
extern void SV_SendServerinfo(client_t *client);
void SV_ReadClientMessage(void)
{
- int cmd, clientnum = host_client->number;
+ int cmd, num;
char *s;
//MSG_BeginReading ();
for(;;)
{
- if (!(host_client = svs.connectedclients[clientnum]))
+ if (!host_client->active)
{
// a command caused an error
SV_DropClient (false);
if (msg_badread)
{
- Con_Printf ("SV_ReadClientMessage: badread\n");
+ Con_Print("SV_ReadClientMessage: badread\n");
SV_DropClient (false);
return;
}
switch (cmd)
{
default:
- Con_Printf ("SV_ReadClientMessage: unknown command char %i\n", cmd);
+ Con_Printf("SV_ReadClientMessage: unknown command char %i\n", cmd);
SV_DropClient (false);
return;
{
G_INT(OFS_PARM0) = PR_SetString(s);
pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
- PR_ExecuteProgram ((func_t)(SV_ParseClientCommandQC - pr_functions), "");
+ PR_ExecuteProgram ((func_t)(SV_ParseClientCommandQC - pr_functions), "QC function SV_ParseClientCommand is missing");
}
else if (strncasecmp(s, "status", 6) == 0
|| strncasecmp(s, "name", 4) == 0
|| strncasecmp(s, "ping", 4) == 0
|| strncasecmp(s, "ban", 3) == 0
|| strncasecmp(s, "pmodel", 6) == 0
+ || strncasecmp(s, "rate", 4) == 0
+ || strncasecmp(s, "playermodel", 11) == 0
+ || strncasecmp(s, "playerskin", 10) == 0
|| (gamemode == GAME_NEHAHRA && (strncasecmp(s, "max", 3) == 0 || strncasecmp(s, "monster", 7) == 0 || strncasecmp(s, "scrag", 5) == 0 || strncasecmp(s, "gimme", 5) == 0 || strncasecmp(s, "wraith", 6) == 0))
|| (gamemode != GAME_NEHAHRA && (strncasecmp(s, "god", 3) == 0 || strncasecmp(s, "notarget", 8) == 0 || strncasecmp(s, "fly", 3) == 0 || strncasecmp(s, "give", 4) == 0 || strncasecmp(s, "noclip", 6) == 0)))
Cmd_ExecuteString (s, src_client);
SV_ReadClientMove (&host_client->cmd);
break;
- case clc_ackentities:
- //if (dpprotocol == DPPROTOCOL_VERSION1 || dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3)
- // EntityFrame_AckFrame(&host_client->entitydatabase, MSG_ReadLong());
- //else
- EntityFrame4_AckFrame(host_client->entitydatabase4, MSG_ReadLong());
+ case clc_ackframe:
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ num = MSG_ReadLong();
+ if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+ if (developer_networkentities.integer >= 1)
+ Con_Printf("recv clc_ackframe %i\n", num);
+ if (host_client->latestframenum < num)
+ {
+ int i;
+ for (i = host_client->latestframenum + 1;i < num;i++)
+ SV_FrameLost(i);
+ SV_FrameAck(num);
+ host_client->latestframenum = num;
+ }
break;
}
}
{
int i;
- for (i = 0;i < MAX_SCOREBOARD;i++)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
{
- if (!(host_client = svs.connectedclients[i]))
+ if (!host_client->active)
continue;
- sv_player = host_client->edict;
-
if (!host_client->spawned)
{
// clear client movement until a new packet is received
if (SV_PlayerPhysicsQC)
{
pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(sv_player);
- PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions), "");
+ pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+ PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions), "QC function SV_PlayerPhysics is missing");
}
else
SV_ClientThink ();
- SV_CheckVelocity (sv_player);
+ SV_CheckVelocity(host_client->edict);
// LordHavoc: a hack to ensure that the (rather silly) id1 quakec
// player_run/player_stand1 does not horribly malfunction if the
// velocity becomes a number that is both == 0 and != 0
// (sounds to me like NaN but to be absolutely safe...)
- if (DotProduct(sv_player->v->velocity, sv_player->v->velocity) < 0.0001)
- VectorClear(sv_player->v->velocity);
+ if (DotProduct(host_client->edict->v->velocity, host_client->edict->v->velocity) < 0.0001)
+ VectorClear(host_client->edict->v->velocity);
}
}
}
projects / xonotic / darkplaces.git / blobdiff