From 822b0b84af7e3f891e4eb576a12be53ed75e275b Mon Sep 17 00:00:00 2001 From: dhewg Date: Thu, 28 Jun 2012 13:31:35 +0200 Subject: [PATCH] s/ReadDeltaLongCounter/ReadDeltaIntCounter/ to match the return type --- neo/framework/async/AsyncNetwork.cpp | 2 +- neo/idlib/BitMsg.cpp | 12 ++++++------ neo/idlib/BitMsg.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/neo/framework/async/AsyncNetwork.cpp b/neo/framework/async/AsyncNetwork.cpp index 44dfa537..9d2e3fe9 100644 --- a/neo/framework/async/AsyncNetwork.cpp +++ b/neo/framework/async/AsyncNetwork.cpp @@ -226,7 +226,7 @@ void idAsyncNetwork::ReadUserCmdDelta( const idBitMsg &msg, usercmd_t &cmd, cons memset( &cmd, 0, sizeof( cmd ) ); if ( base ) { - cmd.gameTime = msg.ReadDeltaLongCounter( base->gameTime ); + cmd.gameTime = msg.ReadDeltaIntCounter( base->gameTime ); cmd.buttons = msg.ReadDeltaByte( base->buttons ); cmd.mx = msg.ReadDeltaShort( base->mx ); cmd.my = msg.ReadDeltaShort( base->my ); diff --git a/neo/idlib/BitMsg.cpp b/neo/idlib/BitMsg.cpp index 9d679f3a..e740c759 100644 --- a/neo/idlib/BitMsg.cpp +++ b/neo/idlib/BitMsg.cpp @@ -536,10 +536,10 @@ int idBitMsg::ReadDeltaShortCounter( int oldValue ) const { /* ================ -idBitMsg::ReadDeltaLongCounter +idBitMsg::ReadDeltaIntCounter ================ */ -int idBitMsg::ReadDeltaLongCounter( int oldValue ) const { +int idBitMsg::ReadDeltaIntCounter( int oldValue ) const { int i, newValue; i = ReadBits( 5 ); @@ -1041,21 +1041,21 @@ int idBitMsgDelta::ReadDeltaShortCounter( int oldValue ) const { /* ================ -idBitMsgDelta::ReadDeltaLongCounter +idBitMsgDelta::ReadDeltaIntCounter ================ */ -int idBitMsgDelta::ReadDeltaLongCounter( int oldValue ) const { +int idBitMsgDelta::ReadDeltaIntCounter( int oldValue ) const { int value; if ( !base ) { - value = readDelta->ReadDeltaLongCounter( oldValue ); + value = readDelta->ReadDeltaIntCounter( oldValue ); changed = true; } else { int baseValue = base->ReadBits( 32 ); if ( !readDelta || readDelta->ReadBits( 1 ) == 0 ) { value = baseValue; } else { - value = readDelta->ReadDeltaLongCounter( oldValue ); + value = readDelta->ReadDeltaIntCounter( oldValue ); changed = true; } } diff --git a/neo/idlib/BitMsg.h b/neo/idlib/BitMsg.h index bfc5bea3..4ea7d7ca 100644 --- a/neo/idlib/BitMsg.h +++ b/neo/idlib/BitMsg.h @@ -131,7 +131,7 @@ public: float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const; int ReadDeltaByteCounter( int oldValue ) const; int ReadDeltaShortCounter( int oldValue ) const; - int ReadDeltaLongCounter( int oldValue ) const; + int ReadDeltaIntCounter( int oldValue ) const; bool ReadDeltaDict( idDict &dict, const idDict *base ) const; static int DirToBits( const idVec3 &dir, int numBits ); @@ -497,7 +497,7 @@ public: float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const; int ReadDeltaByteCounter( int oldValue ) const; int ReadDeltaShortCounter( int oldValue ) const; - int ReadDeltaLongCounter( int oldValue ) const; + int ReadDeltaIntCounter( int oldValue ) const; private: const idBitMsg *base; // base