From dd5d388661a38936f1102bcbbb0a730187d0d811 Mon Sep 17 00:00:00 2001 From: BenCat07 Date: Thu, 24 May 2018 10:53:48 +0200 Subject: [PATCH] Revert attach-backtrace-scramble changes --- attach-backtrace-scramble.sh | 5 ----- src/hooks/CreateMove.cpp | 7 +++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/attach-backtrace-scramble.sh b/attach-backtrace-scramble.sh index 7ac2b196..3a586022 100755 --- a/attach-backtrace-scramble.sh +++ b/attach-backtrace-scramble.sh @@ -44,11 +44,6 @@ gdb -n -q -batch \ -ex "call dlerror()" \ -ex "print (char *) $2" \ -ex "catch syscall exit exit_group" \ - -ex "detach" \ - -ex "quit" -wait 1000 -gdb -n -q -batch \ - -ex "attach $proc" \ -ex "continue" \ -ex "backtrace" diff --git a/src/hooks/CreateMove.cpp b/src/hooks/CreateMove.cpp index 2f6bcb88..a85012fa 100644 --- a/src/hooks/CreateMove.cpp +++ b/src/hooks/CreateMove.cpp @@ -562,9 +562,6 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time, ch->SendNetMsg(senddata, false); ch->Transmit(); } - else if (votelogger::active && - votelogger::antikick.test_and_set(antikick_time * 1000)) - votelogger::active = false; else if (!votelogger::active && DelayTimer.check((int) delay * 1000)) { for (int i = 0; i < (int) serverlag_amount; i++) @@ -573,7 +570,9 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time, } prevflow = ch->GetAvgData(FLOW_INCOMING); } - + else if (votelogger::active && + votelogger::antikick.test_and_set(antikick_time * 1000)) + votelogger::active = false; // PROF_END("CreateMove"); if (!(cmd->buttons & IN_ATTACK)) {