diff options
| author | Jørgen P. Tjernø <[email protected]> | 2013-12-02 19:31:46 -0800 |
|---|---|---|
| committer | Jørgen P. Tjernø <[email protected]> | 2013-12-02 19:46:31 -0800 |
| commit | f56bb35301836e56582a575a75864392a0177875 (patch) | |
| tree | de61ddd39de3e7df52759711950b4c288592f0dc /mp/src/game/shared/usercmd.cpp | |
| parent | Mark some more files as text. (diff) | |
| download | source-sdk-2013-f56bb35301836e56582a575a75864392a0177875.tar.xz source-sdk-2013-f56bb35301836e56582a575a75864392a0177875.zip | |
Fix line endings. WHAMMY.
Diffstat (limited to 'mp/src/game/shared/usercmd.cpp')
| -rw-r--r-- | mp/src/game/shared/usercmd.cpp | 612 |
1 files changed, 306 insertions, 306 deletions
diff --git a/mp/src/game/shared/usercmd.cpp b/mp/src/game/shared/usercmd.cpp index bd8c302a..84ffa243 100644 --- a/mp/src/game/shared/usercmd.cpp +++ b/mp/src/game/shared/usercmd.cpp @@ -1,306 +1,306 @@ -//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose:
-//
-// $NoKeywords: $
-//=============================================================================//
-
-#include "cbase.h"
-#include "usercmd.h"
-#include "bitbuf.h"
-#include "checksum_md5.h"
-
-// memdbgon must be the last include file in a .cpp file!!!
-#include "tier0/memdbgon.h"
-
-// TF2 specific, need enough space for OBJ_LAST items from tf_shareddefs.h
-#define WEAPON_SUBTYPE_BITS 6
-
-//-----------------------------------------------------------------------------
-// Purpose: Write a delta compressed user command.
-// Input : *buf -
-// *to -
-// *from -
-// Output : static
-//-----------------------------------------------------------------------------
-void WriteUsercmd( bf_write *buf, const CUserCmd *to, const CUserCmd *from )
-{
- if ( to->command_number != ( from->command_number + 1 ) )
- {
- buf->WriteOneBit( 1 );
- buf->WriteUBitLong( to->command_number, 32 );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->tick_count != ( from->tick_count + 1 ) )
- {
- buf->WriteOneBit( 1 );
- buf->WriteUBitLong( to->tick_count, 32 );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
-
- if ( to->viewangles[ 0 ] != from->viewangles[ 0 ] )
- {
- buf->WriteOneBit( 1 );
- buf->WriteFloat( to->viewangles[ 0 ] );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->viewangles[ 1 ] != from->viewangles[ 1 ] )
- {
- buf->WriteOneBit( 1 );
- buf->WriteFloat( to->viewangles[ 1 ] );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->viewangles[ 2 ] != from->viewangles[ 2 ] )
- {
- buf->WriteOneBit( 1 );
- buf->WriteFloat( to->viewangles[ 2 ] );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->forwardmove != from->forwardmove )
- {
- buf->WriteOneBit( 1 );
- buf->WriteFloat( to->forwardmove );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->sidemove != from->sidemove )
- {
- buf->WriteOneBit( 1 );
- buf->WriteFloat( to->sidemove );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->upmove != from->upmove )
- {
- buf->WriteOneBit( 1 );
- buf->WriteFloat( to->upmove );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->buttons != from->buttons )
- {
- buf->WriteOneBit( 1 );
- buf->WriteUBitLong( to->buttons, 32 );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->impulse != from->impulse )
- {
- buf->WriteOneBit( 1 );
- buf->WriteUBitLong( to->impulse, 8 );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
-
- if ( to->weaponselect != from->weaponselect )
- {
- buf->WriteOneBit( 1 );
- buf->WriteUBitLong( to->weaponselect, MAX_EDICT_BITS );
-
- if ( to->weaponsubtype != from->weaponsubtype )
- {
- buf->WriteOneBit( 1 );
- buf->WriteUBitLong( to->weaponsubtype, WEAPON_SUBTYPE_BITS );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
-
- // TODO: Can probably get away with fewer bits.
- if ( to->mousedx != from->mousedx )
- {
- buf->WriteOneBit( 1 );
- buf->WriteShort( to->mousedx );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
- if ( to->mousedy != from->mousedy )
- {
- buf->WriteOneBit( 1 );
- buf->WriteShort( to->mousedy );
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-
-#if defined( HL2_CLIENT_DLL )
- if ( to->entitygroundcontact.Count() != 0 )
- {
- buf->WriteOneBit( 1 );
- buf->WriteShort( to->entitygroundcontact.Count() );
- int i;
- for (i = 0; i < to->entitygroundcontact.Count(); i++)
- {
- buf->WriteUBitLong( to->entitygroundcontact[i].entindex, MAX_EDICT_BITS );
- buf->WriteBitCoord( to->entitygroundcontact[i].minheight );
- buf->WriteBitCoord( to->entitygroundcontact[i].maxheight );
- }
- }
- else
- {
- buf->WriteOneBit( 0 );
- }
-#endif
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Read in a delta compressed usercommand.
-// Input : *buf -
-// *move -
-// *from -
-// Output : static void ReadUsercmd
-//-----------------------------------------------------------------------------
-void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from )
-{
- // Assume no change
- *move = *from;
-
- if ( buf->ReadOneBit() )
- {
- move->command_number = buf->ReadUBitLong( 32 );
- }
- else
- {
- // Assume steady increment
- move->command_number = from->command_number + 1;
- }
-
- if ( buf->ReadOneBit() )
- {
- move->tick_count = buf->ReadUBitLong( 32 );
- }
- else
- {
- // Assume steady increment
- move->tick_count = from->tick_count + 1;
- }
-
- // Read direction
- if ( buf->ReadOneBit() )
- {
- move->viewangles[0] = buf->ReadFloat();
- }
-
- if ( buf->ReadOneBit() )
- {
- move->viewangles[1] = buf->ReadFloat();
- }
-
- if ( buf->ReadOneBit() )
- {
- move->viewangles[2] = buf->ReadFloat();
- }
-
- // Moved value validation and clamping to CBasePlayer::ProcessUsercmds()
-
- // Read movement
- if ( buf->ReadOneBit() )
- {
- move->forwardmove = buf->ReadFloat();
- }
-
- if ( buf->ReadOneBit() )
- {
- move->sidemove = buf->ReadFloat();
- }
-
- if ( buf->ReadOneBit() )
- {
- move->upmove = buf->ReadFloat();
- }
-
- // read buttons
- if ( buf->ReadOneBit() )
- {
- move->buttons = buf->ReadUBitLong( 32 );
- }
-
- if ( buf->ReadOneBit() )
- {
- move->impulse = buf->ReadUBitLong( 8 );
- }
-
-
- if ( buf->ReadOneBit() )
- {
- move->weaponselect = buf->ReadUBitLong( MAX_EDICT_BITS );
- if ( buf->ReadOneBit() )
- {
- move->weaponsubtype = buf->ReadUBitLong( WEAPON_SUBTYPE_BITS );
- }
- }
-
-
- move->random_seed = MD5_PseudoRandom( move->command_number ) & 0x7fffffff;
-
- if ( buf->ReadOneBit() )
- {
- move->mousedx = buf->ReadShort();
- }
-
- if ( buf->ReadOneBit() )
- {
- move->mousedy = buf->ReadShort();
- }
-
-#if defined( HL2_DLL )
- if ( buf->ReadOneBit() )
- {
- move->entitygroundcontact.SetCount( buf->ReadShort() );
-
- int i;
- for (i = 0; i < move->entitygroundcontact.Count(); i++)
- {
- move->entitygroundcontact[i].entindex = buf->ReadUBitLong( MAX_EDICT_BITS );
- move->entitygroundcontact[i].minheight = buf->ReadBitCoord( );
- move->entitygroundcontact[i].maxheight = buf->ReadBitCoord( );
- }
- }
-#endif
-}
+//========= Copyright Valve Corporation, All rights reserved. ============// +// +// Purpose: +// +// $NoKeywords: $ +//=============================================================================// + +#include "cbase.h" +#include "usercmd.h" +#include "bitbuf.h" +#include "checksum_md5.h" + +// memdbgon must be the last include file in a .cpp file!!! +#include "tier0/memdbgon.h" + +// TF2 specific, need enough space for OBJ_LAST items from tf_shareddefs.h +#define WEAPON_SUBTYPE_BITS 6 + +//----------------------------------------------------------------------------- +// Purpose: Write a delta compressed user command. +// Input : *buf - +// *to - +// *from - +// Output : static +//----------------------------------------------------------------------------- +void WriteUsercmd( bf_write *buf, const CUserCmd *to, const CUserCmd *from ) +{ + if ( to->command_number != ( from->command_number + 1 ) ) + { + buf->WriteOneBit( 1 ); + buf->WriteUBitLong( to->command_number, 32 ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->tick_count != ( from->tick_count + 1 ) ) + { + buf->WriteOneBit( 1 ); + buf->WriteUBitLong( to->tick_count, 32 ); + } + else + { + buf->WriteOneBit( 0 ); + } + + + if ( to->viewangles[ 0 ] != from->viewangles[ 0 ] ) + { + buf->WriteOneBit( 1 ); + buf->WriteFloat( to->viewangles[ 0 ] ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->viewangles[ 1 ] != from->viewangles[ 1 ] ) + { + buf->WriteOneBit( 1 ); + buf->WriteFloat( to->viewangles[ 1 ] ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->viewangles[ 2 ] != from->viewangles[ 2 ] ) + { + buf->WriteOneBit( 1 ); + buf->WriteFloat( to->viewangles[ 2 ] ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->forwardmove != from->forwardmove ) + { + buf->WriteOneBit( 1 ); + buf->WriteFloat( to->forwardmove ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->sidemove != from->sidemove ) + { + buf->WriteOneBit( 1 ); + buf->WriteFloat( to->sidemove ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->upmove != from->upmove ) + { + buf->WriteOneBit( 1 ); + buf->WriteFloat( to->upmove ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->buttons != from->buttons ) + { + buf->WriteOneBit( 1 ); + buf->WriteUBitLong( to->buttons, 32 ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->impulse != from->impulse ) + { + buf->WriteOneBit( 1 ); + buf->WriteUBitLong( to->impulse, 8 ); + } + else + { + buf->WriteOneBit( 0 ); + } + + + if ( to->weaponselect != from->weaponselect ) + { + buf->WriteOneBit( 1 ); + buf->WriteUBitLong( to->weaponselect, MAX_EDICT_BITS ); + + if ( to->weaponsubtype != from->weaponsubtype ) + { + buf->WriteOneBit( 1 ); + buf->WriteUBitLong( to->weaponsubtype, WEAPON_SUBTYPE_BITS ); + } + else + { + buf->WriteOneBit( 0 ); + } + } + else + { + buf->WriteOneBit( 0 ); + } + + + // TODO: Can probably get away with fewer bits. + if ( to->mousedx != from->mousedx ) + { + buf->WriteOneBit( 1 ); + buf->WriteShort( to->mousedx ); + } + else + { + buf->WriteOneBit( 0 ); + } + + if ( to->mousedy != from->mousedy ) + { + buf->WriteOneBit( 1 ); + buf->WriteShort( to->mousedy ); + } + else + { + buf->WriteOneBit( 0 ); + } + +#if defined( HL2_CLIENT_DLL ) + if ( to->entitygroundcontact.Count() != 0 ) + { + buf->WriteOneBit( 1 ); + buf->WriteShort( to->entitygroundcontact.Count() ); + int i; + for (i = 0; i < to->entitygroundcontact.Count(); i++) + { + buf->WriteUBitLong( to->entitygroundcontact[i].entindex, MAX_EDICT_BITS ); + buf->WriteBitCoord( to->entitygroundcontact[i].minheight ); + buf->WriteBitCoord( to->entitygroundcontact[i].maxheight ); + } + } + else + { + buf->WriteOneBit( 0 ); + } +#endif +} + +//----------------------------------------------------------------------------- +// Purpose: Read in a delta compressed usercommand. +// Input : *buf - +// *move - +// *from - +// Output : static void ReadUsercmd +//----------------------------------------------------------------------------- +void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from ) +{ + // Assume no change + *move = *from; + + if ( buf->ReadOneBit() ) + { + move->command_number = buf->ReadUBitLong( 32 ); + } + else + { + // Assume steady increment + move->command_number = from->command_number + 1; + } + + if ( buf->ReadOneBit() ) + { + move->tick_count = buf->ReadUBitLong( 32 ); + } + else + { + // Assume steady increment + move->tick_count = from->tick_count + 1; + } + + // Read direction + if ( buf->ReadOneBit() ) + { + move->viewangles[0] = buf->ReadFloat(); + } + + if ( buf->ReadOneBit() ) + { + move->viewangles[1] = buf->ReadFloat(); + } + + if ( buf->ReadOneBit() ) + { + move->viewangles[2] = buf->ReadFloat(); + } + + // Moved value validation and clamping to CBasePlayer::ProcessUsercmds() + + // Read movement + if ( buf->ReadOneBit() ) + { + move->forwardmove = buf->ReadFloat(); + } + + if ( buf->ReadOneBit() ) + { + move->sidemove = buf->ReadFloat(); + } + + if ( buf->ReadOneBit() ) + { + move->upmove = buf->ReadFloat(); + } + + // read buttons + if ( buf->ReadOneBit() ) + { + move->buttons = buf->ReadUBitLong( 32 ); + } + + if ( buf->ReadOneBit() ) + { + move->impulse = buf->ReadUBitLong( 8 ); + } + + + if ( buf->ReadOneBit() ) + { + move->weaponselect = buf->ReadUBitLong( MAX_EDICT_BITS ); + if ( buf->ReadOneBit() ) + { + move->weaponsubtype = buf->ReadUBitLong( WEAPON_SUBTYPE_BITS ); + } + } + + + move->random_seed = MD5_PseudoRandom( move->command_number ) & 0x7fffffff; + + if ( buf->ReadOneBit() ) + { + move->mousedx = buf->ReadShort(); + } + + if ( buf->ReadOneBit() ) + { + move->mousedy = buf->ReadShort(); + } + +#if defined( HL2_DLL ) + if ( buf->ReadOneBit() ) + { + move->entitygroundcontact.SetCount( buf->ReadShort() ); + + int i; + for (i = 0; i < move->entitygroundcontact.Count(); i++) + { + move->entitygroundcontact[i].entindex = buf->ReadUBitLong( MAX_EDICT_BITS ); + move->entitygroundcontact[i].minheight = buf->ReadBitCoord( ); + move->entitygroundcontact[i].maxheight = buf->ReadBitCoord( ); + } + } +#endif +} |