teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[qcommon/msg.c] Remove dead code (which had undefined behaviour)

This commit is contained in:
Thomas Köppe 2016-09-12 12:41:37 +01:00
parent ec3779988c
commit fe111df610
1 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
code/qcommon/msg.c
View File

@ -101,12 +101,9 @@ bit functions
============================================================================= =============================================================================
*/ */
int overflows;
// negative bit values include signs // negative bit values include signs
void MSG_WriteBits( msg_t *msg, int value, int bits ) { void MSG_WriteBits( msg_t *msg, int value, int bits ) {
int i; int i;
// FILE* fp;
oldsize += bits; oldsize += bits;
@ -120,69 +117,46 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
Com_Error( ERR_DROP, "MSG_WriteBits: bad bits %i", bits ); Com_Error( ERR_DROP, "MSG_WriteBits: bad bits %i", bits );
} }
// check for overflows
if ( bits != 32 ) {
if ( bits > 0 ) {
if ( value > ( ( 1 << bits ) - 1 ) || value < 0 ) {
overflows++;
}
} else {
int r;
r = 1 << (bits-1);
if ( value > r - 1 || value < -r ) {
overflows++;
}
}
}
if ( bits < 0 ) { if ( bits < 0 ) {
bits = -bits; bits = -bits;
} }
if (msg->oob) {
if(bits==8) if ( msg->oob ) {
{ if ( bits == 8 ) {
msg->data[msg->cursize] = value; msg->data[msg->cursize] = value;
msg->cursize += 1; msg->cursize += 1;
msg->bit += 8; msg->bit += 8;
} } else if ( bits == 16 ) {
else if(bits==16)
{
short temp = value; short temp = value;
CopyLittleShort(&msg->data[msg->cursize], &temp); CopyLittleShort( &msg->data[msg->cursize], &temp );
msg->cursize += 2; msg->cursize += 2;
msg->bit += 16; msg->bit += 16;
} } else if ( bits==32 ) {
else if(bits==32) CopyLittleLong( &msg->data[msg->cursize], &value );
{
CopyLittleLong(&msg->data[msg->cursize], &value);
msg->cursize += 4; msg->cursize += 4;
msg->bit += 32; msg->bit += 32;
} else {
Com_Error( ERR_DROP, "can't write %d bits", bits );
} }
else
Com_Error(ERR_DROP, "can't write %d bits", bits);
} else { } else {
// fp = fopen("c:\\netchan.bin", "a"); value &= (0xffffffff >> (32 - bits));
value &= (0xffffffff>>(32-bits)); if ( bits&7 ) {
if (bits&7) {
int nbits; int nbits;
nbits = bits&7; nbits = bits&7;
for(i=0;i<nbits;i++) { for( i = 0; i < nbits; i++ ) {
Huff_putBit((value&1), msg->data, &msg->bit); Huff_putBit( (value & 1), msg->data, &msg->bit );
value = (value>>1); value = (value >> 1);
} }
bits = bits - nbits; bits = bits - nbits;
} }
if (bits) { if ( bits ) {
for(i=0;i<bits;i+=8) { for( i = 0; i < bits; i += 8 ) {
// fwrite(bp, 1, 1, fp); Huff_offsetTransmit( &msgHuff.compressor, (value & 0xff), msg->data, &msg->bit );
Huff_offsetTransmit (&msgHuff.compressor, (value&0xff), msg->data, &msg->bit); value = (value >> 8);
value = (value>>8);
} }
} }
msg->cursize = (msg->bit>>3)+1; msg->cursize = (msg->bit >> 3) + 1;
// fclose(fp);
} }
} }