mirror of
https://github.com/dhewm/dhewm3.git
synced 2025-01-31 13:40:38 +00:00
s/ReadDeltaLongCounter/ReadDeltaIntCounter/
to match the return type
This commit is contained in:
parent
c51f59cb15
commit
822b0b84af
3 changed files with 9 additions and 9 deletions
|
@ -226,7 +226,7 @@ void idAsyncNetwork::ReadUserCmdDelta( const idBitMsg &msg, usercmd_t &cmd, cons
|
||||||
memset( &cmd, 0, sizeof( cmd ) );
|
memset( &cmd, 0, sizeof( cmd ) );
|
||||||
|
|
||||||
if ( base ) {
|
if ( base ) {
|
||||||
cmd.gameTime = msg.ReadDeltaLongCounter( base->gameTime );
|
cmd.gameTime = msg.ReadDeltaIntCounter( base->gameTime );
|
||||||
cmd.buttons = msg.ReadDeltaByte( base->buttons );
|
cmd.buttons = msg.ReadDeltaByte( base->buttons );
|
||||||
cmd.mx = msg.ReadDeltaShort( base->mx );
|
cmd.mx = msg.ReadDeltaShort( base->mx );
|
||||||
cmd.my = msg.ReadDeltaShort( base->my );
|
cmd.my = msg.ReadDeltaShort( base->my );
|
||||||
|
|
|
@ -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;
|
int i, newValue;
|
||||||
|
|
||||||
i = ReadBits( 5 );
|
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;
|
int value;
|
||||||
|
|
||||||
if ( !base ) {
|
if ( !base ) {
|
||||||
value = readDelta->ReadDeltaLongCounter( oldValue );
|
value = readDelta->ReadDeltaIntCounter( oldValue );
|
||||||
changed = true;
|
changed = true;
|
||||||
} else {
|
} else {
|
||||||
int baseValue = base->ReadBits( 32 );
|
int baseValue = base->ReadBits( 32 );
|
||||||
if ( !readDelta || readDelta->ReadBits( 1 ) == 0 ) {
|
if ( !readDelta || readDelta->ReadBits( 1 ) == 0 ) {
|
||||||
value = baseValue;
|
value = baseValue;
|
||||||
} else {
|
} else {
|
||||||
value = readDelta->ReadDeltaLongCounter( oldValue );
|
value = readDelta->ReadDeltaIntCounter( oldValue );
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,7 +131,7 @@ public:
|
||||||
float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const;
|
float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const;
|
||||||
int ReadDeltaByteCounter( int oldValue ) const;
|
int ReadDeltaByteCounter( int oldValue ) const;
|
||||||
int ReadDeltaShortCounter( 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;
|
bool ReadDeltaDict( idDict &dict, const idDict *base ) const;
|
||||||
|
|
||||||
static int DirToBits( const idVec3 &dir, int numBits );
|
static int DirToBits( const idVec3 &dir, int numBits );
|
||||||
|
@ -497,7 +497,7 @@ public:
|
||||||
float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const;
|
float ReadDeltaFloat( float oldValue, int exponentBits, int mantissaBits ) const;
|
||||||
int ReadDeltaByteCounter( int oldValue ) const;
|
int ReadDeltaByteCounter( int oldValue ) const;
|
||||||
int ReadDeltaShortCounter( int oldValue ) const;
|
int ReadDeltaShortCounter( int oldValue ) const;
|
||||||
int ReadDeltaLongCounter( int oldValue ) const;
|
int ReadDeltaIntCounter( int oldValue ) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const idBitMsg *base; // base
|
const idBitMsg *base; // base
|
||||||
|
|
Loading…
Reference in a new issue