From 7800db47f2cd00c4c01b002d85ec2c4c61e578e4 Mon Sep 17 00:00:00 2001 From: navewindre Date: Fri, 14 Sep 2018 16:38:28 +0200 Subject: s --- internal_rewrite/c_base_player.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'internal_rewrite/c_base_player.cpp') diff --git a/internal_rewrite/c_base_player.cpp b/internal_rewrite/c_base_player.cpp index 68e2cf2..904fe32 100644 --- a/internal_rewrite/c_base_player.cpp +++ b/internal_rewrite/c_base_player.cpp @@ -508,15 +508,15 @@ void c_base_player::cache_anim_data( ) { int idx = ce( )->GetIndex( ); auto& animdata = sm_animdata[ idx ]; - util::memcpy( animdata.m_poseparams.data( ), + memcpy( &animdata.m_poseparams, m_flPoseParameter( ), sizeof( float ) * 24 ); - util::memcpy( animdata.m_animlayers.data( ), + memcpy( &animdata.m_animlayers, m_AnimOverlay( ).GetElements( ), sizeof( C_AnimationLayer ) * 13 ); - util::memcpy( animdata.m_bones, + memcpy( animdata.m_bones, m_CachedBoneData( ).GetElements( ), sizeof( matrix3x4 ) * m_CachedBoneData( ).GetSize( ) ); } @@ -525,17 +525,17 @@ void c_base_player::restore_anim_data( bool layers ) { int idx = ce( )->GetIndex( ); auto& animdata = sm_animdata[ idx ]; - util::memcpy( m_flPoseParameter( ), - animdata.m_poseparams.data( ), + memcpy( m_flPoseParameter( ), + &animdata.m_poseparams, sizeof( float ) * 24 ); if( layers ) { - util::memcpy( m_AnimOverlay( ).GetElements( ), - animdata.m_animlayers.data( ), + memcpy( m_AnimOverlay( ).GetElements( ), + &animdata.m_animlayers, sizeof( C_AnimationLayer ) * 13 ); } - util::memcpy( animdata.m_bones, + memcpy( animdata.m_bones, m_CachedBoneData( ).GetElements( ), sizeof( matrix3x4 ) * m_CachedBoneData( ).GetSize( ) ); } @@ -581,7 +581,7 @@ void c_base_player::do_ent_interpolation( bool reset ) { float update_delta = anim_data->m_simtime - anim_data->m_last_simtime; float update_lerp = std::clamp( update_delta - lerp, 0.f, 1.f ); - if( !update_delta ) + if( update_delta < TICK_INTERVAL( ) ) return; lerp = std::clamp( lerp, 0.f, update_delta ); -- cgit v1.2.3