FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00
Code Issues 2 Projects Releases Wiki Activity

engine: net_encode: equality comparisions replaced with Q_equal macros

Browse Source
This commit is contained in:
SNMetamorph 2021-07-08 20:01:30 +04:00 committed by Alibek Omarov #SupportRMS
parent af3c0686c5
commit 09d647182d
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engine/common/net_encode.c
View File

@ -473,7 +473,7 @@ qboolean Delta_AddField( const char *pStructName, const char *pName, int flags,
void Delta_WriteTableField( sizebuf_t *msg, int tableIndex, const delta_t *pField ) void Delta_WriteTableField( sizebuf_t *msg, int tableIndex, const delta_t *pField )
{ {
int nameIndex; int nameIndex;
delta_info_t *dt; delta_info_t *dt;
Assert( pField != NULL ); Assert( pField != NULL );
@ -494,14 +494,14 @@ void Delta_WriteTableField( sizebuf_t *msg, int tableIndex, const delta_t *pFiel
MSG_WriteUBitLong( msg, pField->bits - 1, 5 ); // max received value is 32 (32 bit) MSG_WriteUBitLong( msg, pField->bits - 1, 5 ); // max received value is 32 (32 bit)
// multipliers is null-compressed // multipliers is null-compressed
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal(pField->multiplier, 1.0f) )
{ {
MSG_WriteOneBit( msg, 1 ); MSG_WriteOneBit( msg, 1 );
MSG_WriteFloat( msg, pField->multiplier ); MSG_WriteFloat( msg, pField->multiplier );
} }
else MSG_WriteOneBit( msg, 0 ); else MSG_WriteOneBit( msg, 0 );
if( pField->post_multiplier <= 0.9999f || pField->post_multiplier >= 1.0001f ) if( !Q_equal(pField->post_multiplier, 1.0f) )
{ {
MSG_WriteOneBit( msg, 1 ); MSG_WriteOneBit( msg, 1 );
MSG_WriteFloat( msg, pField->post_multiplier ); MSG_WriteFloat( msg, pField->post_multiplier );
@ -950,10 +950,10 @@ qboolean Delta_CompareField( delta_t *pField, void *from, void *to, double timeb
fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits ); fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits );
toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits ); toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal(pField->multiplier, 1.0) )
fromF *= pField->multiplier; fromF *= pField->multiplier;
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
toF *= pField->multiplier; toF *= pField->multiplier;
} }
else if( pField->flags & DT_SHORT ) else if( pField->flags & DT_SHORT )
@ -972,10 +972,10 @@ qboolean Delta_CompareField( delta_t *pField, void *from, void *to, double timeb
fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits ); fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits );
toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits ); toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
fromF *= pField->multiplier; fromF *= pField->multiplier;
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
toF *= pField->multiplier; toF *= pField->multiplier;
} }
else if( pField->flags & DT_INTEGER ) else if( pField->flags & DT_INTEGER )
@ -999,9 +999,9 @@ qboolean Delta_CompareField( delta_t *pField, void *from, void *to, double timeb
#endif #endif
fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits ); fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits );
toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits ); toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
fromF *= pField->multiplier; fromF *= pField->multiplier;
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
toF *= pField->multiplier; toF *= pField->multiplier;
} }
else if( pField->flags & ( DT_ANGLE|DT_FLOAT )) else if( pField->flags & ( DT_ANGLE|DT_FLOAT ))
@ -1024,7 +1024,7 @@ qboolean Delta_CompareField( delta_t *pField, void *from, void *to, double timeb
val_a = (*(float *)((byte *)from + pField->offset )); val_a = (*(float *)((byte *)from + pField->offset ));
val_b = (*(float *)((byte *)to + pField->offset )); val_b = (*(float *)((byte *)to + pField->offset ));
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
{ {
val_a *= pField->multiplier; val_a *= pField->multiplier;
val_b *= pField->multiplier; val_b *= pField->multiplier;
@ -1141,7 +1141,7 @@ qboolean Delta_WriteField( sizebuf_t *msg, delta_t *pField, void *from, void *to
iValue = *(uint8_t *)((int8_t *)to + pField->offset ); iValue = *(uint8_t *)((int8_t *)to + pField->offset );
iValue = Delta_ClampIntegerField( pField, iValue, bSigned, pField->bits ); iValue = Delta_ClampIntegerField( pField, iValue, bSigned, pField->bits );
if( pField->multiplier < 0.9999f || pField->multiplier > 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
iValue *= pField->multiplier; iValue *= pField->multiplier;
MSG_WriteBitLong( msg, iValue, pField->bits, bSigned ); MSG_WriteBitLong( msg, iValue, pField->bits, bSigned );
@ -1154,7 +1154,7 @@ qboolean Delta_WriteField( sizebuf_t *msg, delta_t *pField, void *from, void *to
iValue = *(uint16_t *)((int8_t *)to + pField->offset ); iValue = *(uint16_t *)((int8_t *)to + pField->offset );
iValue = Delta_ClampIntegerField( pField, iValue, bSigned, pField->bits ); iValue = Delta_ClampIntegerField( pField, iValue, bSigned, pField->bits );
if( pField->multiplier < 0.9999f || pField->multiplier > 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
iValue *= pField->multiplier; iValue *= pField->multiplier;
MSG_WriteBitLong( msg, iValue, pField->bits, bSigned ); MSG_WriteBitLong( msg, iValue, pField->bits, bSigned );
@ -1174,7 +1174,7 @@ qboolean Delta_WriteField( sizebuf_t *msg, delta_t *pField, void *from, void *to
#endif #endif
iValue = Delta_ClampIntegerField( pField, iValue, bSigned, pField->bits ); iValue = Delta_ClampIntegerField( pField, iValue, bSigned, pField->bits );
if( pField->multiplier < 0.9999f || pField->multiplier > 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
iValue *= pField->multiplier; iValue *= pField->multiplier;
MSG_WriteBitLong( msg, iValue, pField->bits, bSigned ); MSG_WriteBitLong( msg, iValue, pField->bits, bSigned );
@ -1244,7 +1244,7 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to,
if( bChanged ) if( bChanged )
{ {
iValue = MSG_ReadBitLong( msg, pField->bits, bSigned ); iValue = MSG_ReadBitLong( msg, pField->bits, bSigned );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
iValue /= pField->multiplier; iValue /= pField->multiplier;
} }
else else
@ -1264,7 +1264,7 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to,
if( bChanged ) if( bChanged )
{ {
iValue = MSG_ReadBitLong( msg, pField->bits, bSigned ); iValue = MSG_ReadBitLong( msg, pField->bits, bSigned );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
iValue /= pField->multiplier; iValue /= pField->multiplier;
} }
else else
@ -1288,7 +1288,7 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to,
if( bChanged ) if( bChanged )
{ {
iValue = MSG_ReadBitLong( msg, pField->bits, bSigned ); iValue = MSG_ReadBitLong( msg, pField->bits, bSigned );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
iValue /= pField->multiplier; iValue /= pField->multiplier;
} }
else else
@ -1316,10 +1316,10 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to,
else else
flValue = iValue; flValue = iValue;
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
flValue = flValue / pField->multiplier; flValue = flValue / pField->multiplier;
if( pField->post_multiplier <= 0.9999f || pField->post_multiplier >= 1.0001f) if( !Q_equal( pField->post_multiplier, 1.0 ) )
flValue = flValue * pField->post_multiplier; flValue = flValue * pField->post_multiplier;
} }
else else
@ -1361,7 +1361,7 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to,
bSigned = true; // timewindow is always signed bSigned = true; // timewindow is always signed
iValue = MSG_ReadBitLong( msg, pField->bits, bSigned ); iValue = MSG_ReadBitLong( msg, pField->bits, bSigned );
if( pField->multiplier <= 0.9999f || pField->multiplier >= 1.0001f ) if( !Q_equal( pField->multiplier, 1.0 ) )
flTime = ( timebase * pField->multiplier - iValue ) / pField->multiplier; flTime = ( timebase * pField->multiplier - iValue ) / pField->multiplier;
else else
flTime = timebase - iValue; flTime = timebase - iValue;