tier1: Use x86-64 lengths for bitbuf APIs

Author: dimhotepus

common/netmessages.cpp

@@ -54,10 +54,6 @@ bool CLC_VoiceData::ReadFromBuffer( bf_read &buffer )
 
 	m_nLength = buffer.ReadWord();	// length in bits
 
-#if defined ( _X360 )
-	m_xuid	= buffer.ReadLongLong();
-#endif
-
 	m_DataIn = buffer;
 
 	return buffer.SeekRelative( m_nLength );
@@ -1015,11 +1011,6 @@ bool SVC_VoiceData::ReadFromBuffer( bf_read &buffer )
 	m_bProximity = !!buffer.ReadByte();
 	m_nLength = buffer.ReadWord();
 
-	if ( IsX360() )
-	{
-		m_xuid =  buffer.ReadLongLong();
-	}
-
 	m_DataIn = buffer;
 	return buffer.SeekRelative( m_nLength );
 }
@@ -1850,7 +1841,7 @@ bool MM_ClientInfo::WriteToBuffer( bf_write &buffer )
 	buffer.WriteLongLong( m_id );			// 64 bit
 	buffer.WriteByte( m_cPlayers );
 	buffer.WriteByte( m_bInvited );
-	for ( int i = 0; i < m_cPlayers; ++i )
+	for ( byte i = 0; i < m_cPlayers; ++i )
 	{
 		buffer.WriteLongLong( m_xuids[i] );	// 64 bit
 		buffer.WriteBytes( &m_cVoiceState, sizeof( m_cVoiceState ) );
@@ -1868,7 +1859,7 @@ bool MM_ClientInfo::ReadFromBuffer( bf_read &buffer )
 	m_id = buffer.ReadLongLong();			// 64 bit
 	m_cPlayers = buffer.ReadByte();
 	m_bInvited = (buffer.ReadByte() != 0);
-	for ( int i = 0; i < m_cPlayers; ++i )
+	for ( byte i = 0; i < m_cPlayers; ++i )
 	{
 		m_xuids[i] = buffer.ReadLongLong();	// 64 bit
 		buffer.ReadBytes( m_cVoiceState );
@@ -1882,7 +1873,7 @@ bool MM_ClientInfo::ReadFromBuffer( bf_read &buffer )
 
 const char *MM_ClientInfo::ToString( void ) const
 {
-	Q_snprintf( s_text, sizeof( s_text ), "Client Info: ID: %llu, Players: %d", m_id, m_cPlayers );
+	Q_snprintf( s_text, sizeof( s_text ), "Client Info: ID: %llu, Players: %hhu", m_id, m_cPlayers );
 	return s_text;
 }
 
@@ -1909,7 +1900,7 @@ bool MM_Mutelist::WriteToBuffer( bf_write &buffer )
 
 	buffer.WriteLongLong( m_id );
 	buffer.WriteByte( m_cPlayers );
-	for ( int i = 0; i < m_cPlayers; ++i )
+	for ( byte i = 0; i < m_cPlayers; ++i )
 	{
 		buffer.WriteByte( m_cRemoteTalkers[i] );
 		buffer.WriteLongLong( m_xuid[i] ); // 64 bit
@@ -1926,12 +1917,12 @@ bool MM_Mutelist::ReadFromBuffer( bf_read &buffer )
 {
 	m_id = buffer.ReadLongLong();
 	m_cPlayers = buffer.ReadByte();
-	for ( int i = 0; i < m_cPlayers; ++i )
+	for ( byte i = 0; i < m_cPlayers; ++i )
 	{
 		m_cRemoteTalkers[i] = buffer.ReadByte();
 		m_xuid[i] = buffer.ReadLongLong();	// 64 bit
 		m_cMuted[i] = buffer.ReadByte();
-		for ( int j = 0; j < m_cMuted[i]; ++j )
+		for ( byte j = 0; j < m_cMuted[i]; ++j )
 		{
 			m_Muted[i].AddToTail( buffer.ReadLongLong() );
 		}

common/netmessages.h

@@ -885,7 +885,7 @@ class MM_ClientInfo : public CNetMessage
 	uint64	m_xuids[MAX_PLAYERS_PER_CLIENT];
 	byte	m_cVoiceState[MAX_PLAYERS_PER_CLIENT];
 	bool	m_bInvited;
-	char	m_cPlayers;
+	byte	m_cPlayers;
 	char	m_iControllers[MAX_PLAYERS_PER_CLIENT];
 	char	m_iTeam[MAX_PLAYERS_PER_CLIENT];
 	char	m_szGamertags[MAX_PLAYERS_PER_CLIENT][MAX_PLAYER_NAME_LENGTH];

game/client/c_tesla.cpp

@@ -26,18 +26,19 @@ void C_Tesla::ReceiveMessage( int classID, bf_read &msg )
 {
 	CTeslaInfo teslaInfo;
 
+	// See CTesla::DoSpark
+
 	msg.ReadBitVec3Coord( teslaInfo.m_vPos );
 	teslaInfo.m_vAngles.Init();
 
 	teslaInfo.m_nEntIndex = msg.ReadShort();
 	teslaInfo.m_flRadius = msg.ReadFloat();
 
-	teslaInfo.m_vColor.x = ((unsigned char)msg.ReadChar()) / 255.0f;
-	teslaInfo.m_vColor.y = ((unsigned char)msg.ReadChar()) / 255.0f;
-	teslaInfo.m_vColor.z = ((unsigned char)msg.ReadChar()) / 255.0f;
+	teslaInfo.m_vColor.x = msg.ReadByte() / 255.0f;
+	teslaInfo.m_vColor.y = msg.ReadByte() / 255.0f;
+	teslaInfo.m_vColor.z = msg.ReadByte() / 255.0f;
 
-	float flAlpha = 0;
-	flAlpha = ((unsigned char)msg.ReadChar()) / 255.0f;
+	float flAlpha = msg.ReadByte() / 255.0f;
 
 	teslaInfo.m_nBeams = msg.ReadChar();
 

public/tier1/bitbuf.h

@@ -169,32 +169,31 @@ class bf_write
 	void			SetDebugName( const char *pDebugName );
 
 
-// Seek to a specific position.
 public:
-	
+	// Seek to a specific position.	
 	void			SeekToBit( intp bitPos );
 
 
 // Bit functions.
 public:
 
-	void			WriteOneBit(int nValue);
-	void			WriteOneBitNoCheck(int nValue);
+	void			WriteOneBit( int nValue );
+	void			WriteOneBitNoCheck( int nValue );
 	void			WriteOneBitAt( int iBit, int nValue );
 
 	// Write signed or unsigned. Range is only checked in debug.
-	void			WriteUBitLong( unsigned int data, int numbits, bool bCheckRange=true );
-	void			WriteSBitLong( int data, int numbits );
+	void			WriteUBitLong( uint32 data, int numbits, bool bCheckRange=true );
+	void			WriteSBitLong( int32 data, int numbits );
 
 	// Tell it whether or not the data is unsigned. If it's signed,
 	// cast to unsigned before passing in (it will cast back inside).
-	void			WriteBitLong(unsigned int data, int numbits, bool bSigned);
+	void			WriteBitLong( uint32 data, int numbits, bool bSigned );
 
 	// Write a list of bits in.
-	bool			WriteBits(const void *pIn, int nBits);
+	bool			WriteBits( const void *pIn, intp nBits );
 
 	// writes an unsigned integer with variable bit length
-	void			WriteUBitVar( unsigned int data );
+	void			WriteUBitVar( uint32 data );
 
 	// writes a varint encoded integer
 	void			WriteVarInt32( uint32 data );
@@ -208,12 +207,12 @@ class bf_write
 
 	// Copy the bits straight out of pIn. This seeks pIn forward by nBits.
 	// Returns an error if this buffer or the read buffer overflows.
-	bool			WriteBitsFromBuffer( class bf_read *pIn, int nBits );
+	bool			WriteBitsFromBuffer( class bf_read *pIn, intp nBits );
 
 	void			WriteBitAngle( float fAngle, int numbits );
-	void			WriteBitCoord (const float f);
+	void			WriteBitCoord( const float f );
 	void			WriteBitCoordMP( const float f, bool bIntegral, bool bLowPrecision );
-	void			WriteBitFloat(float val);
+	void			WriteBitFloat( float val );
 	void			WriteBitVec3Coord( const Vector& fa );
 	void			WriteBitNormal( float f );
 	void			WriteBitVec3Normal( const Vector& fa );
@@ -232,7 +231,7 @@ class bf_write
 	void			WriteLongLong(int64 val);
 	void			WriteULongLong(uint64 val);
 	void			WriteFloat(float val);
-	bool			WriteBytes( const void *pBuf, int nBytes );
+	bool			WriteBytes( const void *pBuf, intp nBytes );
 
 	// Returns false if it overflows the buffer.
 	bool			WriteString(const char *pStr);
@@ -247,8 +246,8 @@ class bf_write
 	[[nodiscard]] intp				GetMaxNumBits() const;
 	[[nodiscard]] intp				GetNumBitsLeft() const;
 	[[nodiscard]] intp				GetNumBytesLeft() const;
-	[[nodiscard]] unsigned char*	GetData();
-	[[nodiscard]] const unsigned char*	GetData() const;
+	[[nodiscard]] byte*	GetData();
+	[[nodiscard]] const byte*	GetData() const;
 
 	// Has the buffer overflowed?
 	[[nodiscard]] bool			CheckForOverflow(intp nBits);
@@ -306,14 +305,14 @@ inline intp bf_write::GetNumBytesLeft() const
 	return GetNumBitsLeft() >> 3;
 }
 
-inline unsigned char* bf_write::GetData() //-V524
+inline byte* bf_write::GetData() //-V524
 {
-	return (unsigned char*) m_pData;
+	return (byte*) m_pData;
 }
 
-inline const unsigned char* bf_write::GetData()	const
+inline const byte* bf_write::GetData()	const
 {
-	return (unsigned char*) m_pData;
+	return (byte*) m_pData;
 }
 
 BITBUF_INLINE bool bf_write::CheckForOverflow(intp nBits)
@@ -391,7 +390,7 @@ inline void	bf_write::WriteOneBitAt( int iBit, int nValue )
 #endif
 }
 
-BITBUF_INLINE void bf_write::WriteUBitLong( unsigned int curData, int numbits, [[maybe_unused]] bool bCheckRange )
+BITBUF_INLINE void bf_write::WriteUBitLong( uint32 curData, int numbits, [[maybe_unused]] bool bCheckRange )
 {
 #ifdef _DEBUG
 	// Make sure it doesn't overflow.
@@ -444,7 +443,7 @@ BITBUF_INLINE void bf_write::WriteUBitLong( unsigned int curData, int numbits, [
 }
 
 // writes an unsigned integer with variable bit length
-BITBUF_INLINE void bf_write::WriteUBitVar( unsigned int data )
+BITBUF_INLINE void bf_write::WriteUBitVar( uint32 data )
 {
 	/* Reference:
 	if ( data < 0x10u )
@@ -544,7 +543,7 @@ class bf_read
 	// Get the base pointer.
 	[[nodiscard]] const unsigned char*	GetBasePointer() const { return m_pData; }
 
-	[[nodiscard]] BITBUF_INLINE intp TotalBytesAvailable( void ) const
+	[[nodiscard]] BITBUF_INLINE intp TotalBytesAvailable() const
 	{
 		return m_nDataBytes;
 	}
@@ -554,23 +553,23 @@ class bf_read
 	// Read a list of bits in, but don't overrun the destination buffer.
 	// Returns the number of bits read into the buffer. The remaining
 	// bits are skipped over.
-	int             ReadBitsClamped_ptr(void *pOut, size_t outSizeBytes, size_t nBits);
+	intp            ReadBitsClamped_ptr(void *pOut, intp outSizeBytes, intp nBits);
 	// Helper 'safe' template function that infers the size of the destination
 	// array. This version of the function should be preferred.
 	// Usage: char databuffer[100];
 	//        ReadBitsClamped( dataBuffer, msg->m_nLength );
-	template <typename T, size_t N>
-	int ReadBitsClamped( T (&pOut)[N], size_t nBits )
+	template <typename T, intp N>
+	intp ReadBitsClamped( T (&pOut)[N], intp nBits )
 	{
 		return ReadBitsClamped_ptr( pOut, N * sizeof(T), nBits );
 	}
 
 	[[nodiscard]] float			ReadBitAngle( int numbits );
 
-	[[nodiscard]] unsigned int	ReadUBitLong( int numbits );
-	[[nodiscard]] unsigned int	ReadUBitLongNoInline( int numbits );
-	[[nodiscard]] unsigned int	PeekUBitLong( int numbits );
-	[[nodiscard]] int			ReadSBitLong( int numbits );
+	[[nodiscard]] uint32		ReadUBitLong( int numbits );
+	[[nodiscard]] uint32		ReadUBitLongNoInline( int numbits );
+	[[nodiscard]] uint32		PeekUBitLong( int numbits );
+	[[nodiscard]] int32			ReadSBitLong( int numbits );
 
 	// reads an unsigned integer with variable bit length
 	[[nodiscard]] unsigned int	ReadUBitVar();
@@ -792,7 +791,7 @@ BITBUF_INLINE unsigned int bf_read::ReadUBitVar()
 	return sixbits >> 2;
 }
 
-BITBUF_INLINE unsigned int bf_read::ReadUBitLong( int numbits )
+BITBUF_INLINE uint32 bf_read::ReadUBitLong( int numbits )
 {
 	Assert( numbits > 0 && numbits <= 32 );