From 8dfc6df02af543223f0afa8f62c903e3a2bff929 Mon Sep 17 00:00:00 2001 From: dhewg Date: Thu, 28 Jun 2012 13:34:41 +0200 Subject: [PATCH] s/ReadDeltaLong/ReadDeltaInt/ to match the argument type --- d3xp/Game_network.cpp | 2 +- d3xp/physics/Physics_Player.cpp | 2 +- game/Game_network.cpp | 2 +- game/physics/Physics_Player.cpp | 2 +- idlib/BitMsg.h | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/d3xp/Game_network.cpp b/d3xp/Game_network.cpp index e651cb5..36d799e 100644 --- a/d3xp/Game_network.cpp +++ b/d3xp/Game_network.cpp @@ -1172,7 +1172,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam gameLocal.pvs.ReadPVS( pvsHandle, msg ); #endif for ( i = 0; i < ENTITY_PVS_SIZE; i++ ) { - snapshot->pvs[i] = msg.ReadDeltaLong( clientPVS[clientNum][i] ); + snapshot->pvs[i] = msg.ReadDeltaInt( clientPVS[clientNum][i] ); } // add entities in the PVS that haven't changed since the last applied snapshot diff --git a/d3xp/physics/Physics_Player.cpp b/d3xp/physics/Physics_Player.cpp index a2f319d..af1a764 100644 --- a/d3xp/physics/Physics_Player.cpp +++ b/d3xp/physics/Physics_Player.cpp @@ -2036,7 +2036,7 @@ void idPhysics_Player::ReadFromSnapshot( const idBitMsgDelta &msg ) { current.stepUp = msg.ReadDeltaFloat( 0.0f ); current.movementType = msg.ReadBits( PLAYER_MOVEMENT_TYPE_BITS ); current.movementFlags = msg.ReadBits( PLAYER_MOVEMENT_FLAGS_BITS ); - current.movementTime = msg.ReadDeltaLong( 0 ); + current.movementTime = msg.ReadDeltaInt( 0 ); if ( clipModel ) { clipModel->Link( gameLocal.clip, self, 0, current.origin, clipModel->GetAxis() ); diff --git a/game/Game_network.cpp b/game/Game_network.cpp index 7d712d5..c26d906 100644 --- a/game/Game_network.cpp +++ b/game/Game_network.cpp @@ -1144,7 +1144,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam gameLocal.pvs.ReadPVS( pvsHandle, msg ); #endif for ( i = 0; i < ENTITY_PVS_SIZE; i++ ) { - snapshot->pvs[i] = msg.ReadDeltaLong( clientPVS[clientNum][i] ); + snapshot->pvs[i] = msg.ReadDeltaInt( clientPVS[clientNum][i] ); } // add entities in the PVS that haven't changed since the last applied snapshot diff --git a/game/physics/Physics_Player.cpp b/game/physics/Physics_Player.cpp index a2f319d..af1a764 100644 --- a/game/physics/Physics_Player.cpp +++ b/game/physics/Physics_Player.cpp @@ -2036,7 +2036,7 @@ void idPhysics_Player::ReadFromSnapshot( const idBitMsgDelta &msg ) { current.stepUp = msg.ReadDeltaFloat( 0.0f ); current.movementType = msg.ReadBits( PLAYER_MOVEMENT_TYPE_BITS ); current.movementFlags = msg.ReadBits( PLAYER_MOVEMENT_FLAGS_BITS ); - current.movementTime = msg.ReadDeltaLong( 0 ); + current.movementTime = msg.ReadDeltaInt( 0 ); if ( clipModel ) { clipModel->Link( gameLocal.clip, self, 0, current.origin, clipModel->GetAxis() ); diff --git a/idlib/BitMsg.h b/idlib/BitMsg.h index 5cf9762..e853bf7 100644 --- a/idlib/BitMsg.h +++ b/idlib/BitMsg.h @@ -126,7 +126,7 @@ public: int ReadDeltaChar( int oldValue ) const; int ReadDeltaByte( int oldValue ) const; int ReadDeltaShort( int oldValue ) const; - int ReadDeltaLong( int oldValue ) const; + int ReadDeltaInt( int oldValue ) const; float ReadDeltaFloat( float oldValue ) const; float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const; int ReadDeltaByteCounter( int oldValue ) const; @@ -415,7 +415,7 @@ ID_INLINE int idBitMsg::ReadDeltaShort( int oldValue ) const { return (short)ReadDelta( oldValue, -16 ); } -ID_INLINE int idBitMsg::ReadDeltaLong( int oldValue ) const { +ID_INLINE int idBitMsg::ReadDeltaInt( int oldValue ) const { return ReadDelta( oldValue, 32 ); } @@ -492,7 +492,7 @@ public: int ReadDeltaChar( int oldValue ) const; int ReadDeltaByte( int oldValue ) const; int ReadDeltaShort( int oldValue ) const; - int ReadDeltaLong( int oldValue ) const; + int ReadDeltaInt( int oldValue ) const; float ReadDeltaFloat( float oldValue ) const; float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const; int ReadDeltaByteCounter( int oldValue ) const; @@ -661,7 +661,7 @@ ID_INLINE int idBitMsgDelta::ReadDeltaShort( int oldValue ) const { return (short)ReadDelta( oldValue, -16 ); } -ID_INLINE int idBitMsgDelta::ReadDeltaLong( int oldValue ) const { +ID_INLINE int idBitMsgDelta::ReadDeltaInt( int oldValue ) const { return ReadDelta( oldValue, 32 ); }