summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornavewindre <boneyaard@gmail.com>2018-09-13 16:44:14 +0200
committernavewindre <boneyaard@gmail.com>2018-09-13 16:44:14 +0200
commitf10ea5a18540a7cc02b66a1ebf76a903022d98e9 (patch)
treeaece8845f5f3a5797b96148a6f8b6866591a2a65
parent3c72119a3c474e11f9ee819def492dcbfd1e8f84 (diff)
n m
-rw-r--r--internal_rewrite/c_base_player.cpp5
-rw-r--r--internal_rewrite/visual_player.cpp2
2 files changed, 2 insertions, 5 deletions
diff --git a/internal_rewrite/c_base_player.cpp b/internal_rewrite/c_base_player.cpp
index 791b0ed..68e2cf2 100644
--- a/internal_rewrite/c_base_player.cpp
+++ b/internal_rewrite/c_base_player.cpp
@@ -584,12 +584,9 @@ void c_base_player::do_ent_interpolation( bool reset ) {
if( !update_delta )
return;
- if( update_delta > 0.f )
- lerp = std::clamp( lerp, 0.f, update_delta );
+ lerp = std::clamp( lerp, 0.f, update_delta );
float lerp_progress = ( anim_data->m_simtime + lerp - g_csgo.m_globals->m_curtime ) / lerp;
- if( lerp_progress < 0.f && update_delta == TICK_INTERVAL( ) )
- lerp_progress = 1.f + lerp_progress;
vec3_t vec_lerp = math::lerp( origin, anim_data->m_last_interp_origin, std::clamp( lerp_progress, 0.f, 1.f ) );
diff --git a/internal_rewrite/visual_player.cpp b/internal_rewrite/visual_player.cpp
index eeb5cca..ae3d52c 100644
--- a/internal_rewrite/visual_player.cpp
+++ b/internal_rewrite/visual_player.cpp
@@ -121,7 +121,7 @@ namespace features
if( bone && bone->parent != -1 && bone->flags & 0x100 ) {
auto& matrix = bone_matrix[ i ];
vec3_t hitbox = vec3_t( matrix[ 0 ][ 3 ], matrix[ 1 ][ 3 ], matrix[ 2 ][ 3 ] );
- hitbox -= ent->m_vecOrigin( );
+ hitbox -= ent->ce( )->GetRenderOrigin( );
hitbox += stored_origin;