Skip to content
Permalink
Browse files

Fix jetpack effect staying on when you switch class while jetpacking

 - This will cause 'Server uses different class tables'
  • Loading branch information...
squeek502 committed Sep 19, 2016
1 parent 917fb3c commit 02290a28f134cdea21d387c9ec336d9798ee7e6a
Showing with 2 additions and 4 deletions.
  1. +1 −1 cl_dll/ff/c_ff_player.cpp
  2. +1 −3 dlls/ff/ff_player.cpp
@@ -822,7 +822,6 @@ BEGIN_RECV_TABLE_NOBASE( C_FFPlayer, DT_FFLocalPlayerExclusive )
END_RECV_TABLE( )

BEGIN_RECV_TABLE_NOBASE( C_FFPlayer, DT_FFNonLocalPlayerExclusive )
RecvPropBool( RECVINFO( m_bJetpacking ) ),
END_RECV_TABLE( )

#ifdef EXTRA_LOCAL_ORIGIN_ACCURACY
@@ -876,6 +875,7 @@ IMPLEMENT_CLIENTCLASS_DT( C_FFPlayer, DT_FFPlayer, CFFPlayer )
RecvPropInt( RECVINFO( m_iCloaked ) ),
//RecvPropFloat( RECVINFO( m_flCloakSpeed ) ),
RecvPropInt( RECVINFO( m_iActiveSabotages ) ),
RecvPropBool( RECVINFO( m_bJetpacking ) ),
END_RECV_TABLE( )

BEGIN_PREDICTION_DATA( C_FFPlayer )
@@ -404,9 +404,6 @@ BEGIN_SEND_TABLE_NOBASE( CFFPlayer, DT_FFLocalPlayerExclusive )
END_SEND_TABLE( )

BEGIN_SEND_TABLE_NOBASE( CFFPlayer, DT_FFNonLocalPlayerExclusive )
// Send m_bJetpacking only to other players, so that the jetpacking client is its own authority for effects/sounds.
// This stops the jetpack sound playing twice when you have high ping.
SendPropBool( SENDINFO( m_bJetpacking ) ),
END_SEND_TABLE()

IMPLEMENT_SERVERCLASS_ST( CFFPlayer, DT_FFPlayer )
@@ -460,6 +457,7 @@ IMPLEMENT_SERVERCLASS_ST( CFFPlayer, DT_FFPlayer )
SendPropInt( SENDINFO( m_iInfectTick ) ),
SendPropInt( SENDINFO( m_iCloaked ), 1, SPROP_UNSIGNED ),
SendPropInt( SENDINFO( m_iActiveSabotages ), 2, SPROP_UNSIGNED ),
SendPropBool( SENDINFO( m_bJetpacking ) ),
END_SEND_TABLE( )

LINK_ENTITY_TO_CLASS( ff_ragdoll, CFFRagdoll );

0 comments on commit 02290a2

Please sign in to comment.
You can’t perform that action at this time.