fd

1 files changed, 12 insertions, 6 deletions

diff --git a/internal_rewrite/ragebot_resolver.cpp b/internal_rewrite/ragebot_resolver.cpp
index 0a7174e..a35a55d 100644
--- a/internal_rewrite/ragebot_resolver.cpp
+++ b/internal_rewrite/ragebot_resolver.cpp
@@ -42,7 +42,7 @@ namespace features
 	}

 

 	int c_ragebot::c_resolver::try_freestanding( c_base_player* ent ) {

-		if( !( ent->m_fFlags( ) & FL_ONGROUND ) || ( ent->m_vecVelocity( ).length2d( ) > 0.1f && !ent->is_fakewalking( ) ) )

+		if( !( ent->m_fFlags( ) & FL_ONGROUND ) || ( ent->get_anim_velocity( ).length2d( ) > 0.1f && !ent->is_fakewalking( ) ) )

 			return -1;

 

 		int ret_dir		 = -1;

@@ -163,7 +163,7 @@ namespace features
 			return;

 		}

 

-		if( ent->m_vecVelocity( ).length2d( ) > 0.1f && !ent->is_fakewalking( ) ) {

+		if( ent->get_anim_velocity( ).length2d( ) > 0.1f && !ent->is_fakewalking( ) ) {

 			m_breaking = BREAKING_NONE;

 			m_has_valid_lby = true;

 			return;

@@ -227,7 +227,7 @@ namespace features
 		auto& data = m_data[ ent_index ];

 

 		auto ent = g_csgo.m_entlist( )->GetClientEntity< >( ent_index );

-		bool moving = ent->m_vecVelocity( ).length2d( ) > 0.1f && ( ent->m_fFlags( ) & FL_ONGROUND );

+		bool moving = ent->get_anim_velocity( ).length2d( ) > 0.1f && ( ent->m_fFlags( ) & FL_ONGROUND );

 

 		if( moving && !ent->is_fakewalking( ) ) {

 			return;

@@ -434,6 +434,12 @@ namespace features
 	}

 

 	void c_ragebot::c_resolver::update_player( int i ) {

+		if( !g_settings.rage.enabled( ) || !g_settings.rage.resolver( ) )

+			return;

+

+		if( !g_cheat.m_player_mgr.is_cheater( i ) )

+			return;

+

 		auto ent = g_csgo.m_entlist( )->GetClientEntity( i );

 		bool was_invalid = m_data[ i ].m_was_invalid;

 

@@ -476,7 +482,7 @@ namespace features
 			if( ent->m_iTeamNum( ) == g_ctx.m_local->m_iTeamNum( ) && !g_settings.rage.friendlies )

 				continue;

 

-			update_player( i );

+			//update_player( i );

 		}

 	}

 

@@ -485,7 +491,7 @@ namespace features
 	}

 

 	int c_ragebot::c_resolver::manual_override( c_base_player* ent ) {

-		if( ent->m_vecVelocity( ).length( ) > 0.1f && !ent->is_fakewalking( ) ) { //no point in overriding moving targets, it will also fuck up backtrack records otherwise

+		if( ent->get_animdata( ).m_anim_velocity.length2d( ) > 0.1f && !ent->is_fakewalking( ) ) { //no point in overriding moving targets, it will also fuck up backtrack records otherwise

 			return OVERRIDE_NONE;

 		}

 

@@ -524,7 +530,7 @@ namespace features
 		if( ent->m_flSimulationTime( ) == g_cheat.m_ragebot.m_lagcomp->get_last_updated_simtime( ent->ce( )->GetIndex( ) ) )

 			return;

 

-		if( ent->m_vecVelocity( ).length( ) > 0.1f && ( ent->m_fFlags( ) & FL_ONGROUND ) && !ent->is_fakewalking( ) ) {

+		if( ent->get_anim_velocity( ).length( ) > 0.1f && ( ent->m_fFlags( ) & FL_ONGROUND ) && !ent->is_fakewalking( ) ) {

 			m_data[ ent->ce( )->GetIndex( ) ].m_last_moving_lby = ent->m_flLowerBodyYawTarget( );

 			m_data[ ent->ce( )->GetIndex( ) ].m_has_valid_lby = true;

 			force_lby( ent );