From d17493562fbe7352d9416ecc9160d04101cae0f3 Mon Sep 17 00:00:00 2001 From: navewindre Date: Mon, 26 Nov 2018 17:50:04 +0100 Subject: dsad --- internal_rewrite/extra.cpp | 41 +++++------------------------------------ internal_rewrite/factory.hpp | 2 +- internal_rewrite/settings.hpp | 4 +--- internal_rewrite/ui.h | 7 +------ 4 files changed, 8 insertions(+), 46 deletions(-) diff --git a/internal_rewrite/extra.cpp b/internal_rewrite/extra.cpp index 36a4e21..2408e7f 100644 --- a/internal_rewrite/extra.cpp +++ b/internal_rewrite/extra.cpp @@ -79,50 +79,19 @@ namespace features } void c_extra::update_netchannel( ) { - if( !g_csgo.m_engine( )->IsInGame( ) || !g_ctx.m_local || - !g_ctx.m_local->is_valid( ) ) { - return; - } - switch( g_settings.misc.net_fakelag ) { - case 0: - g_settings.misc.net_fakeping_active = false; - break; - case 1: - g_settings.misc.net_fakeping_active = g_input.is_key_pressed( g_settings.misc.net_fakeping_key ); - break; - case 2: { - static bool held = false; - bool pressed = g_input.is_key_pressed( g_settings.misc.net_fakeping_key ); - if( pressed ) { - if( !held ) - g_settings.misc.net_fakeping_active ^= 1; - held = true; - } - else held = false; - } - break; - case 3: - g_settings.misc.net_fakeping_active = true; - break; - default: - g_settings.misc.net_fakeping_active = false; - break; - } } void c_extra::add_latency( INetChannel* channel ) { if ( g_ctx.m_local && g_ctx.m_local->is_valid( ) ) { - float latency = g_settings.misc.net_fakeping_amount( ) * 0.001f; - + auto nci = g_csgo.m_engine( )->GetNetChannelInfo( ); - if( g_settings.misc.net_fakeping_active ) { - // I doubt that the code below is actually necessary to accomplish fake latency. - // In fact, it might be the thing that is breaking it. + float in_latency = nci->GetLatency( 0 ); - // float latency_floor = std::floorf( nci->GetLatency( 1 ) * 10.f ) * 0.1f; - // if( g_csgo.m_globals->m_frametime > TICK_INTERVAL( ) || latency_floor <= latency + g_csgo.m_globals->m_frametime * 2.f ) + //arbitrary number much + float latency = 0.15f - ( in_latency + g_csgo.m_globals->m_frametime ) - TICK_INTERVAL( ); + if( g_settings.misc.net_fakeping_active && latency > 0.f ) { channel->m_nInSequenceNr += 2 * 64 - ( 63 * latency ); } } diff --git a/internal_rewrite/factory.hpp b/internal_rewrite/factory.hpp index c81c79b..d197951 100644 --- a/internal_rewrite/factory.hpp +++ b/internal_rewrite/factory.hpp @@ -11,7 +11,7 @@ //IFACE_DLLMAIN - interfaces are passed through dllmain and below code doesnt need to be ran #ifndef _DEBUG //#define IFACE_DLLMAIN -#define HEADER_MODULE +//#define HEADER_MODULE #endif #ifdef IFACE_DLLMAIN diff --git a/internal_rewrite/settings.hpp b/internal_rewrite/settings.hpp index ed59f8f..9da7ec2 100644 --- a/internal_rewrite/settings.hpp +++ b/internal_rewrite/settings.hpp @@ -396,9 +396,7 @@ namespace data con_var< int > thirdperson_key{ &holder_, fnv( "misc_tp_key" ), 0 }; con_var< bool > auto_accept{ &holder_, fnv( "misc_autoaccept" ), false }; con_var< int > auto_accept_delay{ &holder_, fnv( "misc_autoaccept_delay" ), 0 }; - con_var< int > net_fakelag{ &holder_, fnv( "misc_net_fakelag" ), false }; - con_var< int > net_fakeping_amount{ &holder_, fnv( "net_fakeping_amount" ), 0 }; - con_var< int > net_fakeping_key{ &holder_, fnv( "net_fakeping_key" ), 0 }; + con_var< bool > net_fakelag{ &holder_, fnv( "misc_net_fakelag" ), false }; con_var< bool > air_duck{ &holder_, fnv( "air_duck" ) }; bool net_fakeping_active = false; diff --git a/internal_rewrite/ui.h b/internal_rewrite/ui.h index 0970f26..f524f1b 100644 --- a/internal_rewrite/ui.h +++ b/internal_rewrite/ui.h @@ -704,12 +704,7 @@ namespace ui auto fake_ping = std::make_shared< ui::c_form >( 0, 0, 215, 0, xors( "fake latency" ) ); { static auto sv_maxunlag = g_csgo.m_cvar( )->FindVar( "sv_maxunlag" ); - fake_ping->add_item( std::make_shared< ui::c_dropdown< > >( 0, 0, 120, xors( "enabled" ), &g_settings.misc.net_fakelag, - &dropdowns::fake_ping_activation ) )->add_item( std::make_shared< ui::c_key_picker_small >( 195, 0, &g_settings.misc.net_fakeping_key ) - )->set_cond( [ ]( ) { return g_settings.misc.net_fakelag == 1 || g_settings.misc.net_fakelag == 2; } ); - - fake_ping->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 120, 0, 800, xors( "amount" ), &g_settings.misc.net_fakeping_amount( ) ) - )->set_cond( [ ]( ) { return g_settings.misc.net_fakelag; } ); + fake_ping->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "extended backtracking" ), &g_settings.misc.net_fakelag ) ); } auto helpers_form = std::make_shared< ui::c_form >( 0, 0, 215, 0, xors( "helpers" ) ); { -- cgit v1.2.3