qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-18 18:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean up a few error messages, rearange error checks, and change some

Browse source 
"impossible" warnings into errors.
This commit is contained in:
Adam Olsen 2001-10-30 00:24:25 +00:00
parent d835b79352
commit 950331a1f4
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qw/source/cl_ents.c
View file

@ -196,9 +196,10 @@ CL_ParsePacketEntities (void)
for (index = 0; block.words[index]; index++) { for (index = 0; block.words[index]; index++) {
if (block.words[index] & U_REMOVE) { if (block.words[index] & U_REMOVE) {
cl.validsequence = 0;
Host_NetError ("CL_ParsePacketEntities: U_REMOVE on full " Host_NetError ("CL_ParsePacketEntities: U_REMOVE on full "
"update\n"); "update\n");
cl.validsequence = 0; // XXX
cl.frames[packetnum].invalid = true;
return; return;
} }
@ -250,21 +251,24 @@ CL_ParseDeltaPacketEntities ()
cl.frames[newpacket].invalid = false; cl.frames[newpacket].invalid = false;
oldpacket = cl.frames[newpacket].delta_sequence; oldpacket = cl.frames[newpacket].delta_sequence;
if ((block.from & UPDATE_MASK) != (oldpacket & UPDATE_MASK)) {
Host_NetError ("CL_ParseDeltaPacketEntities: from mismatch\n");
return;
}
if (cls.netchan.outgoing_sequence - oldpacket >= UPDATE_BACKUP - 1) {
// we can't use this, it is too old
Host_NetError ("CL_ParseDeltaPacketEntities: old packet\n");
// cl.validsequence = 0; // can't render a frame
// cl.frames[newpacket].invalid = true;
return;
}
if (oldpacket == -1) { if (oldpacket == -1) {
Host_NetError ("Cl_ParseDeltaPacketEntities: invalid " Host_NetError ("Cl_ParseDeltaPacketEntities: invalid "
"delta_sequence\n"); "delta_sequence\n");
return; return;
} }
if ((block.from & UPDATE_MASK) != (oldpacket & UPDATE_MASK))
Con_DPrintf ("CL_ParseDeltaPacketEntities: WARNING: from mismatch\n");
if (cls.netchan.outgoing_sequence - oldpacket >= UPDATE_BACKUP - 1) {
// we can't use this, it is too old
Con_DPrintf ("FlushEntityPacket\n");
cl.validsequence = 0; // can't render a frame
return;
}
cl.validsequence = cls.netchan.incoming_sequence; cl.validsequence = cls.netchan.incoming_sequence;
oldp = &cl.frames[oldpacket & UPDATE_MASK].packet_entities; oldp = &cl.frames[oldpacket & UPDATE_MASK].packet_entities;
@ -352,7 +356,7 @@ CL_ParseDeltaPacketEntities ()
// Con_Printf ("copy %i\n", oldp->entities[oldindex].number); // Con_Printf ("copy %i\n", oldp->entities[oldindex].number);
if (newindex >= MAX_PACKET_ENTITIES) { if (newindex >= MAX_PACKET_ENTITIES) {
Host_NetError ("CL_ParseDeltaPacketEntities: newindex >= " Host_NetError ("CL_ParseDeltaPacketEntities: newindex >= "
"MAX_PACKET_ENTITIES (1st)"); "MAX_PACKET_ENTITIES (3rd)");
return; return;
} }
newp->entities[newindex] = oldp->entities[oldindex]; newp->entities[newindex] = oldp->entities[oldindex];