From 78a6e235c3b0006bf29868d5f7ad0628d522fa79 Mon Sep 17 00:00:00 2001 From: navewindre Date: Fri, 31 Aug 2018 18:57:02 +0200 Subject: ah yes --- internal_rewrite/c_base_player.hpp | 2 +- internal_rewrite/lag_mgr.cpp | 6 ++++++ internal_rewrite/ragebot.cpp | 4 ---- internal_rewrite/settings.hpp | 1 + internal_rewrite/ui.h | 3 ++- internal_rewrite/ui_text_input.cpp | 16 +++++++++++++++- internal_rewrite/ui_text_input.h | 5 +++-- internal_rewrite/update_clientside_animation.cpp | 8 +++++++- 8 files changed, 35 insertions(+), 10 deletions(-) (limited to 'internal_rewrite') diff --git a/internal_rewrite/c_base_player.hpp b/internal_rewrite/c_base_player.hpp index 0ed9aa1..bf8a9c0 100644 --- a/internal_rewrite/c_base_player.hpp +++ b/internal_rewrite/c_base_player.hpp @@ -302,7 +302,7 @@ public: OFFSET( m_CachedBoneData, 0x28FC + sizeof( void* ), CUtlVector< matrix3x4 > ); - OFFSET( m_flSpawnTime, 0xa290, float ); + OFFSET( m_flSpawnTime, 0xA2A0, float ); OFFSET( m_IKContext, 0x265c, IKContext* ); public: static uintptr_t get_player_resource( ); diff --git a/internal_rewrite/lag_mgr.cpp b/internal_rewrite/lag_mgr.cpp index 72ad8c4..ed01568 100644 --- a/internal_rewrite/lag_mgr.cpp +++ b/internal_rewrite/lag_mgr.cpp @@ -127,6 +127,12 @@ namespace features } } + if( settings.jump_reset ) { + if( was_onground && !( g_ctx.m_local->m_fFlags( ) & FL_ONGROUND ) ) { + send = get_choked( ) > 0; + } + } + was_onground = g_ctx.m_local->m_fFlags( ) & FL_ONGROUND; if( ( m_cmd->m_buttons & IN_ATTACK ) && g_ctx.m_local->can_attack( ) && diff --git a/internal_rewrite/ragebot.cpp b/internal_rewrite/ragebot.cpp index 435559e..5e106ce 100644 --- a/internal_rewrite/ragebot.cpp +++ b/internal_rewrite/ragebot.cpp @@ -140,10 +140,6 @@ namespace features vec3_t max_dir = math::angle_vectors( math::vector_angles( center, box->bbmax ) ); vec3_t max = center + max_dir * dist * g_settings.rage.active->m_hitbox_scale * 1.1f; - //float radius = box->m_flRadius * 1.1f * g_settings.rage.active->m_hitbox_scale; - //min -= vec3_t( radius, radius, radius ); - //max += vec3_t( radius, radius, radius ); - static int point_index[ 65 ][ HITBOX_MAX ]; std::array< vec3_t, 8 > points = { diff --git a/internal_rewrite/settings.hpp b/internal_rewrite/settings.hpp index 1a2874e..75641c5 100644 --- a/internal_rewrite/settings.hpp +++ b/internal_rewrite/settings.hpp @@ -228,6 +228,7 @@ namespace data con_var< bool > in_move{ &holder_, fnv( "fakelag_in_move" ), false }; con_var< bool > in_attack{ &holder_, fnv( "fakelag_in_attack" ), false }; con_var< bool > avoid_ground{ &holder_, fnv( "fakelag_avoid_ground" ), false }; + con_var< bool > jump_reset{ &holder_, fnv( "fakelag_jump_reset" ), false }; } fakelag; con_var< bool > anti_aim{ &holder_, fnv( "rage_anti_aim" ), false }; diff --git a/internal_rewrite/ui.h b/internal_rewrite/ui.h index 5585973..4d1ec8e 100644 --- a/internal_rewrite/ui.h +++ b/internal_rewrite/ui.h @@ -35,7 +35,7 @@ namespace ui menu.reset( ); #ifndef _DEBUG - menu = std::make_shared< ui::c_menu >( 10, 10, 580, 470, xors( "moneybot" ), + menu = std::make_shared< ui::c_menu >( 10, 10, 580, 470, xors( "hit p hook" ), date_str.c_str( ) ); #else menu = std::make_shared< ui::c_menu >( 10, 10, 580, 470, xors( "moneybot (cooler edition)" ), @@ -447,6 +447,7 @@ namespace ui flags_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "on peek" ), &g_settings.rage.fakelag.on_peek ) ); flags_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "while shooting" ), &g_settings.rage.fakelag.in_attack ) ); flags_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "avoid ground" ), &g_settings.rage.fakelag.avoid_ground ) ); + flags_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "reset on jump" ), &g_settings.rage.fakelag.jump_reset ) ); } left_column->add_item( main_form ); diff --git a/internal_rewrite/ui_text_input.cpp b/internal_rewrite/ui_text_input.cpp index 44a4ebc..f2c3530 100644 --- a/internal_rewrite/ui_text_input.cpp +++ b/internal_rewrite/ui_text_input.cpp @@ -29,6 +29,11 @@ void ui::c_text_input::render( ) { m_last_key_input[ i ] = current_time; continue; } + + if( i == KEYS_RETURN ) { + m_active = false; + break; + } m_key_states[ i ] = 0xf0; wchar_t pressed_char; @@ -65,5 +70,14 @@ void ui::c_text_input::render( ) { ( is_hovered( ) || m_active ) ? ui_get_text_col( ) : ui_get_accent_col( ) ); ui_draw_rect( x, y, m_width, m_height, ui_get_disabled_col( ) ); - ui_draw_string( x + 2, y + 3, false, ui_get_text_col( ), m_active ? "%s_" : "%s", m_text_ptr ); + if( !m_hidden ) + ui_draw_string( x + 2, y + 3, false, ui_get_text_col( ), m_active ? "%s_" : "%s", m_text_ptr ); + else { + std::string str; + str.append( "*", strlen( m_text_ptr ) ); + if( m_active ) + str += '_'; + + ui_draw_string( x + 2, y + 3, false, ui_get_text_col( ), str.c_str( ) ); + } } \ No newline at end of file diff --git a/internal_rewrite/ui_text_input.h b/internal_rewrite/ui_text_input.h index b651828..243c40b 100644 --- a/internal_rewrite/ui_text_input.h +++ b/internal_rewrite/ui_text_input.h @@ -5,8 +5,8 @@ namespace ui { class c_text_input : public base_item { public: - c_text_input( int x, int y, int w, const char* name, size_t max_chars, char* str ) : - base_item( x, y, w, 16, name ), m_text_len( max_chars ), m_text_ptr( str ) { + c_text_input( int x, int y, int w, const char* name, size_t max_chars, char* str, bool hidden = false ) : + base_item( x, y, w, 16, name ), m_text_len( max_chars ), m_text_ptr( str ), m_hidden( hidden ) { } virtual bool is_hovered( ) override { @@ -33,5 +33,6 @@ namespace ui bool m_active{ }; float m_last_key_input[ KEYS_LAST ]{ }; uint8_t m_key_states[ 256 ]{ }; + bool m_hidden{ }; }; } \ No newline at end of file diff --git a/internal_rewrite/update_clientside_animation.cpp b/internal_rewrite/update_clientside_animation.cpp index b95c8ae..4653fa6 100644 --- a/internal_rewrite/update_clientside_animation.cpp +++ b/internal_rewrite/update_clientside_animation.cpp @@ -11,11 +11,17 @@ void __fastcall hooks::update_clientside_animation( void* ecx_, void* edx_ ) { static ent_animdata_t prev_anims; static float last_choke; static float last_update; + static float last_spawntime = 0.f; + // Arbitrary number much. - if( !g_settings.rage.anti_aim || !g_ctx.m_local->is_valid( ) || std::abs( last_update - g_csgo.m_globals->m_curtime ) > TICKS_TO_TIME( 20 ) ) { + if( !g_settings.rage.anti_aim || !g_ctx.m_local->is_valid( ) || std::abs( last_update - g_csgo.m_globals->m_curtime ) > TICKS_TO_TIME( 20 ) || last_spawntime != ent->m_flSpawnTime( ) ) { last_update = g_csgo.m_globals->m_curtime; first_update = true; + + if( last_spawntime != ent->m_flSpawnTime( ) ) + last_spawntime = ent->m_flSpawnTime( ); + return old_func( ecx_, edx_ ); } -- cgit v1.2.3