bottom[1] = top[1];
bottom[2] = top[2] - 160;
- tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, host_client->edict, SUPERCONTENTS_SOLID);
+ tr = SV_TraceLine(top, bottom, MOVE_NOMONSTERS, host_client->edict, SUPERCONTENTS_SOLID);
// if looking at a wall, leave ideal the way is was
if (tr.startsolid)
return;
start[2] = host_client->edict->fields.server->origin[2] + host_client->edict->fields.server->mins[2];
stop[2] = start[2] - 34;
- trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict, SV_GenericHitSuperContentsMask(host_client->edict));
+ trace = SV_TraceLine(start, stop, MOVE_NOMONSTERS, host_client->edict, SV_GenericHitSuperContentsMask(host_client->edict));
if (trace.fraction == 1.0)
friction = sv_friction.value*sv_edgefriction.value;
host_client->edict->fields.server->velocity[i] += accelspeed*wishdir[i];
}
+extern cvar_t sv_gameplayfix_q2airaccelerate;
void SV_AirAccelerate (vec3_t wishveloc)
{
int i;
addspeed = wishspd - currentspeed;
if (addspeed <= 0)
return;
- accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*wishspeed * sv.frametime;
+ accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*(sv_gameplayfix_q2airaccelerate.integer ? wishspd : wishspeed) * sv.frametime;
if (accelspeed > addspeed)
accelspeed = addspeed;
void DropPunchAngle (void)
{
float len;
- prvm_eval_t *val;
+ vec3_t v;
len = VectorNormalizeLength (host_client->edict->fields.server->punchangle);
len = 0;
VectorScale (host_client->edict->fields.server->punchangle, len, host_client->edict->fields.server->punchangle);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.punchvector)))
+ VectorCopy(PRVM_serveredictvector(host_client->edict, punchvector), v);
+ len = VectorNormalizeLength(v);
+ if (len > 0)
{
- len = VectorNormalizeLength (val->vector);
-
len -= 20*sv.frametime;
if (len < 0)
len = 0;
- VectorScale (val->vector, len, val->vector);
+ VectorScale(v, len, v);
}
+ VectorCopy(v, PRVM_serveredictvector(host_client->edict, punchvector));
}
/*
SV_CheckVelocity(host_client->edict);
// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
- if (prog->funcoffsets.SV_PlayerPhysics && sv_playerphysicsqc.integer)
+ if (PRVM_serverfunction(SV_PlayerPhysics) && sv_playerphysicsqc.integer)
{
prog->globals.server->time = sv.time;
prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
- PRVM_ExecuteProgram (prog->funcoffsets.SV_PlayerPhysics, "QC function SV_PlayerPhysics is missing");
+ PRVM_ExecuteProgram (PRVM_serverfunction(SV_PlayerPhysics), "QC function SV_PlayerPhysics is missing");
SV_CheckVelocity(host_client->edict);
return;
}
if (host_client->edict->fields.server->movetype == MOVETYPE_NONE)
return;
- onground = (int)host_client->edict->fields.server->flags & FL_ONGROUND;
+ onground = ((int)host_client->edict->fields.server->flags & FL_ONGROUND) != 0;
DropPunchAngle ();
// (we have to buffer the moves because of old ones being repeated)
if (sv_numreadmoves < CL_MAX_USERCMDS)
sv_readmoves[sv_numreadmoves++] = *move;
+
+ // movement packet loss tracking
+ if(move->sequence)
+ {
+ if(move->sequence > host_client->movement_highestsequence_seen)
+ {
+ if(host_client->movement_highestsequence_seen)
+ {
+ // mark moves in between as lost
+ if(move->sequence - host_client->movement_highestsequence_seen - 1 < NETGRAPH_PACKETS)
+ for(i = host_client->movement_highestsequence_seen + 1; i < move->sequence; ++i)
+ host_client->movement_count[i % NETGRAPH_PACKETS] = -1;
+ else
+ memset(host_client->movement_count, -1, sizeof(host_client->movement_count));
+ }
+ // mark THIS move as seen for the first time
+ host_client->movement_count[move->sequence % NETGRAPH_PACKETS] = 1;
+ // update highest sequence seen
+ host_client->movement_highestsequence_seen = move->sequence;
+ }
+ else
+ if(host_client->movement_count[move->sequence % NETGRAPH_PACKETS] >= 0)
+ ++host_client->movement_count[move->sequence % NETGRAPH_PACKETS];
+ }
+ else
+ {
+ host_client->movement_highestsequence_seen = 0;
+ memset(host_client->movement_count, 0, sizeof(host_client->movement_count));
+ }
}
void SV_ExecuteClientMoves(void)
#ifdef NUM_PING_TIMES
double total;
#endif
- prvm_eval_t *val;
if (sv_numreadmoves < 1)
return;
// only start accepting input once the player is spawned
if (ceil(max(sv_readmoves[sv_numreadmoves-1].receivetime - sv_readmoves[sv_numreadmoves-1].time, 0) * 1000.0) < sv_clmovement_minping.integer)
host_client->clmovement_disabletimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0;
// several conditions govern whether clientside movement prediction is allowed
- if (sv_readmoves[sv_numreadmoves-1].sequence && sv_clmovement_enable.integer && sv_clmovement_waitforinput.integer > 0 && host_client->clmovement_disabletimeout <= realtime && host_client->edict->fields.server->movetype == MOVETYPE_WALK && (!(val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.disableclientprediction)) || !val->_float))
+ if (sv_readmoves[sv_numreadmoves-1].sequence && sv_clmovement_enable.integer && sv_clmovement_inputtimeout.value > 0 && host_client->clmovement_disabletimeout <= realtime && host_client->edict->fields.server->movetype == MOVETYPE_WALK && (!PRVM_serveredictfloat(host_client->edict, disableclientprediction)))
{
// process the moves in order and ignore old ones
// but always trust the latest move
// this is a new move
move->time = bound(sv.time - 1, move->time, sv.time); // prevent slowhack/speedhack combos
move->time = max(move->time, host_client->cmd.time); // prevent backstepping of time
- moveframetime = bound(0, move->time - host_client->cmd.time, 0.1);
+ moveframetime = bound(0, move->time - host_client->cmd.time, min(0.1, sv_clmovement_inputtimeout.value));
+
+ // discard (treat like lost) moves with too low distance from
+ // the previous one to prevent hacks using float inaccuracy
+ // clients will see this as packet loss in the netgraph
+ // this should also apply if a move cannot get
+ // executed because it came too late and
+ // already was performed serverside
+ if(moveframetime < 0.0005)
+ {
+ // count the move as LOST if we don't
+ // execute it but it has higher
+ // sequence count
+ if(host_client->movesequence)
+ if(move->sequence > host_client->movesequence)
+ host_client->movement_count[(move->sequence) % NETGRAPH_PACKETS] = -1;
+ continue;
+ }
+
//Con_Printf("movesequence = %i (%i lost), moveframetime = %f\n", move->sequence, move->sequence ? move->sequence - host_client->movesequence - 1 : 0, moveframetime);
host_client->cmd = *move;
host_client->movesequence = move->sequence;
// (they can't go beyond the current time so there is no cheat issue
// with this approach, and if they don't send input for a while they
// start moving anyway, so the longest 'lagaport' possible is
- // determined by the sv_clmovement_waitforinput cvar)
+ // determined by the sv_clmovement_inputtimeout cvar)
if (moveframetime <= 0)
continue;
oldframetime = prog->globals.server->frametime;
SV_Physics_ClientMove();
sv.frametime = oldframetime2;
prog->globals.server->frametime = oldframetime;
- host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer;
+ host_client->clmovement_inputtimeout = sv_clmovement_inputtimeout.value;
}
}
}
// time
host_client->movesequence = 0;
// make sure that normal physics takes over immediately
- host_client->clmovement_skipphysicsframes = 0;
+ host_client->clmovement_inputtimeout = 0;
}
// calculate average ping time
void SV_ApplyClientMove (void)
{
- prvm_eval_t *val;
usercmd_t *move = &host_client->cmd;
+ int j, movementloss, packetloss;
if (!move->receivetime)
return;
host_client->edict->fields.server->impulse = move->impulse;
// only send the impulse to qc once
move->impulse = 0;
+
+ movementloss = packetloss = 0;
+ if(host_client->netconnection)
+ {
+ for (j = 0;j < NETGRAPH_PACKETS;j++)
+ if (host_client->netconnection->incoming_netgraph[j].unreliablebytes == NETGRAPH_LOSTPACKET)
+ packetloss++;
+ for (j = 0;j < NETGRAPH_PACKETS;j++)
+ if (host_client->movement_count[j] < 0)
+ movementloss++;
+ }
+
VectorCopy(move->viewangles, host_client->edict->fields.server->v_angle);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button3))) val->_float = ((move->buttons >> 2) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button4))) val->_float = ((move->buttons >> 3) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button5))) val->_float = ((move->buttons >> 4) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button6))) val->_float = ((move->buttons >> 5) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button7))) val->_float = ((move->buttons >> 6) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button8))) val->_float = ((move->buttons >> 7) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button9))) val->_float = ((move->buttons >> 11) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button10))) val->_float = ((move->buttons >> 12) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button11))) val->_float = ((move->buttons >> 13) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button12))) val->_float = ((move->buttons >> 14) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button13))) val->_float = ((move->buttons >> 15) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button14))) val->_float = ((move->buttons >> 16) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button15))) val->_float = ((move->buttons >> 17) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button16))) val->_float = ((move->buttons >> 18) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.buttonuse))) val->_float = ((move->buttons >> 8) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.buttonchat))) val->_float = ((move->buttons >> 9) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_active))) val->_float = ((move->buttons >> 10) & 1);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.movement))) VectorSet(val->vector, move->forwardmove, move->sidemove, move->upmove);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_screen))) VectorCopy(move->cursor_screen, val->vector);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_start))) VectorCopy(move->cursor_start, val->vector);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_ent))) val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
- if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ping))) val->_float = host_client->ping * 1000.0;
+ PRVM_serveredictfloat(host_client->edict, button3) = ((move->buttons >> 2) & 1);
+ PRVM_serveredictfloat(host_client->edict, button4) = ((move->buttons >> 3) & 1);
+ PRVM_serveredictfloat(host_client->edict, button5) = ((move->buttons >> 4) & 1);
+ PRVM_serveredictfloat(host_client->edict, button6) = ((move->buttons >> 5) & 1);
+ PRVM_serveredictfloat(host_client->edict, button7) = ((move->buttons >> 6) & 1);
+ PRVM_serveredictfloat(host_client->edict, button8) = ((move->buttons >> 7) & 1);
+ PRVM_serveredictfloat(host_client->edict, button9) = ((move->buttons >> 11) & 1);
+ PRVM_serveredictfloat(host_client->edict, button10) = ((move->buttons >> 12) & 1);
+ PRVM_serveredictfloat(host_client->edict, button11) = ((move->buttons >> 13) & 1);
+ PRVM_serveredictfloat(host_client->edict, button12) = ((move->buttons >> 14) & 1);
+ PRVM_serveredictfloat(host_client->edict, button13) = ((move->buttons >> 15) & 1);
+ PRVM_serveredictfloat(host_client->edict, button14) = ((move->buttons >> 16) & 1);
+ PRVM_serveredictfloat(host_client->edict, button15) = ((move->buttons >> 17) & 1);
+ PRVM_serveredictfloat(host_client->edict, button16) = ((move->buttons >> 18) & 1);
+ PRVM_serveredictfloat(host_client->edict, buttonuse) = ((move->buttons >> 8) & 1);
+ PRVM_serveredictfloat(host_client->edict, buttonchat) = ((move->buttons >> 9) & 1);
+ PRVM_serveredictfloat(host_client->edict, cursor_active) = ((move->buttons >> 10) & 1);
+ VectorSet(PRVM_serveredictvector(host_client->edict, movement), move->forwardmove, move->sidemove, move->upmove);
+ VectorCopy(move->cursor_screen, PRVM_serveredictvector(host_client->edict, cursor_screen));
+ VectorCopy(move->cursor_start, PRVM_serveredictvector(host_client->edict, cursor_trace_start));
+ VectorCopy(move->cursor_impact, PRVM_serveredictvector(host_client->edict, cursor_trace_endpos));
+ PRVM_serveredictedict(host_client->edict, cursor_trace_ent) = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
+ PRVM_serveredictfloat(host_client->edict, ping) = host_client->ping * 1000.0;
+ PRVM_serveredictfloat(host_client->edict, ping_packetloss) = packetloss / (float) NETGRAPH_PACKETS;
+ PRVM_serveredictfloat(host_client->edict, ping_movementloss) = movementloss / (float) NETGRAPH_PACKETS;
}
void SV_FrameLost(int framenum)
{
if (host_client->entitydatabase5)
+ {
EntityFrame5_LostFrame(host_client->entitydatabase5, framenum);
+ EntityFrameCSQC_LostFrame(host_client, framenum);
+ }
}
void SV_FrameAck(int framenum)
switch (cmd)
{
default:
- Con_Printf("SV_ReadClientMessage: unknown command char %i\n", cmd);
+ Con_Printf("SV_ReadClientMessage: unknown command char %i (at offset 0x%x)\n", cmd, msg_readcount);
+ if (developer_networking.integer)
+ Com_HexDumpToConsole(net_message.data, net_message.cursize);
SV_DropClient (false);
return;
|| strncasecmp(s, "begin", 5) == 0
|| strncasecmp(s, "prespawn", 8) == 0)
Cmd_ExecuteString (s, src_client);
- else if (prog->funcoffsets.SV_ParseClientCommand)
+ else if (PRVM_serverfunction(SV_ParseClientCommand))
{
int restorevm_tempstringsbuf_cursize;
restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(s);
prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
- PRVM_ExecuteProgram (prog->funcoffsets.SV_ParseClientCommand, "QC function SV_ParseClientCommand is missing");
+ PRVM_ExecuteProgram (PRVM_serverfunction(SV_ParseClientCommand), "QC function SV_ParseClientCommand is missing");
vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
}
else
clc_stringcmd_invalid:
Con_Printf("Received invalid stringcmd from %s\n", host_client->name);
- if(developer.integer)
+ if(developer.integer > 0)
Com_HexDumpToConsole((unsigned char *) s, strlen(s));
break;
int crc;
unsigned char *temp;
FS_Seek(host_client->download_file, 0, SEEK_SET);
- temp = Mem_Alloc(tempmempool, size);
+ temp = (unsigned char *) Mem_Alloc(tempmempool, size);
FS_Read(host_client->download_file, temp, size);
crc = CRC_Block(temp, size);
Mem_Free(temp);
// calculated crc, send the file info to the client
// (so that it can verify the data)
- Host_ClientCommands(va("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name));
+ Host_ClientCommands("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name);
Con_DPrintf("Download of %s by %s has finished\n", host_client->download_name, host_client->name);
FS_Close(host_client->download_file);
host_client->download_file = NULL;
projects / xonotic / darkplaces.git / blobdiff