diff --git a/neo/framework/async/AsyncNetwork.cpp b/neo/framework/async/AsyncNetwork.cpp index 9367b752..44dfa537 100644 --- a/neo/framework/async/AsyncNetwork.cpp +++ b/neo/framework/async/AsyncNetwork.cpp @@ -192,7 +192,7 @@ idAsyncNetwork::WriteUserCmdDelta */ void idAsyncNetwork::WriteUserCmdDelta( idBitMsg &msg, const usercmd_t &cmd, const usercmd_t *base ) { if ( base ) { - msg.WriteDeltaLongCounter( base->gameTime, cmd.gameTime ); + msg.WriteDeltaIntCounter( base->gameTime, cmd.gameTime ); msg.WriteDeltaByte( base->buttons, cmd.buttons ); msg.WriteDeltaShort( base->mx, cmd.mx ); msg.WriteDeltaShort( base->my, cmd.my ); diff --git a/neo/idlib/BitMsg.cpp b/neo/idlib/BitMsg.cpp index 27be80d0..9d679f3a 100644 --- a/neo/idlib/BitMsg.cpp +++ b/neo/idlib/BitMsg.cpp @@ -281,10 +281,10 @@ void idBitMsg::WriteDeltaShortCounter( int oldValue, int newValue ) { /* ================ -idBitMsg::WriteDeltaLongCounter +idBitMsg::WriteDeltaIntCounter ================ */ -void idBitMsg::WriteDeltaLongCounter( int oldValue, int newValue ) { +void idBitMsg::WriteDeltaIntCounter( int oldValue, int newValue ) { int i, x; x = oldValue ^ newValue; @@ -887,16 +887,16 @@ void idBitMsgDelta::WriteDeltaShortCounter( int oldValue, int newValue ) { /* ================ -idBitMsgDelta::WriteDeltaLongCounter +idBitMsgDelta::WriteDeltaIntCounter ================ */ -void idBitMsgDelta::WriteDeltaLongCounter( int oldValue, int newValue ) { +void idBitMsgDelta::WriteDeltaIntCounter( int oldValue, int newValue ) { if ( newBase ) { newBase->WriteBits( newValue, 32 ); } if ( !base ) { - writeDelta->WriteDeltaLongCounter( oldValue, newValue ); + writeDelta->WriteDeltaIntCounter( oldValue, newValue ); changed = true; } else { int baseValue = base->ReadBits( 32 ); @@ -904,7 +904,7 @@ void idBitMsgDelta::WriteDeltaLongCounter( int oldValue, int newValue ) { writeDelta->WriteBits( 0, 1 ); } else { writeDelta->WriteBits( 1, 1 ); - writeDelta->WriteDeltaLongCounter( oldValue, newValue ); + writeDelta->WriteDeltaIntCounter( oldValue, newValue ); changed = true; } } diff --git a/neo/idlib/BitMsg.h b/neo/idlib/BitMsg.h index cd61047c..bfc5bea3 100644 --- a/neo/idlib/BitMsg.h +++ b/neo/idlib/BitMsg.h @@ -102,7 +102,7 @@ public: void WriteDeltaFloat( float oldValue, float newValue, int exponentBits, int mantissaBits ); void WriteDeltaByteCounter( int oldValue, int newValue ); void WriteDeltaShortCounter( int oldValue, int newValue ); - void WriteDeltaLongCounter( int oldValue, int newValue ); + void WriteDeltaIntCounter( int oldValue, int newValue ); bool WriteDeltaDict( const idDict &dict, const idDict *base ); void BeginReading( void ) const; // begin reading. @@ -472,7 +472,7 @@ public: void WriteDeltaFloat( float oldValue, float newValue, int exponentBits, int mantissaBits ); void WriteDeltaByteCounter( int oldValue, int newValue ); void WriteDeltaShortCounter( int oldValue, int newValue ); - void WriteDeltaLongCounter( int oldValue, int newValue ); + void WriteDeltaIntCounter( int oldValue, int newValue ); int ReadBits( int numBits ) const; int ReadChar( void ) const;