mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-03-20 09:21:09 +00:00
oops, accidently broke delta updates in bad pl situations
This commit is contained in:
parent
adba6b26dc
commit
080e619675
3 changed files with 7 additions and 6 deletions
|
@ -334,7 +334,7 @@ SV_EmitPacketEntities (delta_t *delta, packet_entities_t *to, sizebuf_t *msg,
|
|||
|
||||
// this is the frame that we are going to delta update from
|
||||
if (delta->delta_sequence != -1) {
|
||||
fromframe = &delta->frames[delta->delta_sequence];
|
||||
fromframe = &delta->frames[delta->delta_sequence & UPDATE_MASK];
|
||||
from = &fromframe->entities;
|
||||
oldmax = from->num_entities;
|
||||
|
||||
|
@ -371,7 +371,7 @@ SV_EmitPacketEntities (delta_t *delta, packet_entities_t *to, sizebuf_t *msg,
|
|||
Sys_Printf ("LOL, %d, %d, %d, %d %d %d\n", newnum, oldnum,
|
||||
to->num_entities, oldmax,
|
||||
delta->in_frame,
|
||||
delta->delta_sequence);
|
||||
delta->delta_sequence & UPDATE_MASK);
|
||||
if (!delta->client)
|
||||
Sys_Printf ("demo\n");
|
||||
}
|
||||
|
@ -580,11 +580,13 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
|
|||
}
|
||||
|
||||
write = write_player;
|
||||
if (!clent)
|
||||
if (!clent && delta->type == dt_tp_demo)
|
||||
write = write_demoplayer;
|
||||
|
||||
if (delta->delta_sequence != -1) {
|
||||
from_pack = &delta->frames[delta->delta_sequence].players;
|
||||
client_frame_t *fromframe;
|
||||
fromframe = &delta->frames[delta->delta_sequence & UPDATE_MASK];
|
||||
from_pack = &frame->players;
|
||||
full = 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -612,7 +612,7 @@ SVR_SetDelta (recorder_t *r, int delta, int in_frame)
|
|||
{
|
||||
r->delta.delta_sequence = -1;
|
||||
if (delta != -1)
|
||||
r->delta.delta_sequence = delta & UPDATE_MASK;
|
||||
r->delta.delta_sequence = delta;
|
||||
r->delta.in_frame = (r->delta.delta_sequence + 1) & UPDATE_MASK;
|
||||
if (in_frame != -1)
|
||||
r->delta.in_frame = in_frame & UPDATE_MASK;
|
||||
|
|
|
@ -1865,7 +1865,6 @@ SV_ExecuteClientMessage (client_t *cl)
|
|||
|
||||
case clc_delta:
|
||||
cl->delta.delta_sequence = MSG_ReadByte (net_message);
|
||||
cl->delta.delta_sequence &= UPDATE_MASK;
|
||||
break;
|
||||
|
||||
case clc_move:
|
||||
|
|
Loading…
Reference in a new issue