From e051c168515251d10a0eba6e723adbee5a24d336 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <1yourexperiment@protonmail.com>
Date: Fri, 20 Jul 2018 20:27:58 +0200
Subject: [PATCH] Fix backtrack issues

---
 src/hacks/Aimbot.cpp       | 3 ++-
 src/hacks/AutoBackstab.cpp | 2 +-
 src/hacks/Backtrack.cpp    | 9 ++++++---
 src/hacks/Trigger.cpp      | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index 70ef0763..cf1a7a21 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -201,7 +201,8 @@ bool BacktrackAimbot()
     {
         bool good_tick = false;
         for (int j = 0; j < 12; ++j)
-            if (tickcnt == hacks::shared::backtrack::sorted_ticks[j].tick && hacks::shared::backtrack::sorted_ticks[j].tickcount != INT_MAX)
+            if (tickcnt == hacks::shared::backtrack::sorted_ticks[j].tick &&
+                hacks::shared::backtrack::sorted_ticks[j].tickcount != INT_MAX)
                 good_tick = true;
         tickcnt++;
         if (!i.hitboxpos.z)
diff --git a/src/hacks/AutoBackstab.cpp b/src/hacks/AutoBackstab.cpp
index 3e0f853f..15cea298 100644
--- a/src/hacks/AutoBackstab.cpp
+++ b/src/hacks/AutoBackstab.cpp
@@ -52,7 +52,7 @@ void CreateMove()
         {
             bool good_tick = false;
             for (int j = 0; j < 12; ++j)
-                if (tickcnt == hacks::shared::backtrack::sorted_ticks[j].tick)
+                if (tickcnt == hacks::shared::backtrack::sorted_ticks[j].tick && hacks::shared::backtrack::sorted_ticks[j].tickcount != INT_MAX)
                     good_tick = true;
             tickcnt++;
             if (!good_tick)
diff --git a/src/hacks/Backtrack.cpp b/src/hacks/Backtrack.cpp
index b2793586..1b70ef1c 100644
--- a/src/hacks/Backtrack.cpp
+++ b/src/hacks/Backtrack.cpp
@@ -9,8 +9,10 @@
 #include "hacks/Backtrack.hpp"
 #include <boost/circular_buffer.hpp>
 #include <glez/draw.hpp>
-#define IsMelee GetWeaponMode() == weapon_melee
-
+bool IsMelee()
+{
+	return GetWeaponMode() == weapon_melee;
+}
 namespace hacks::shared::backtrack
 {
 CatVar enable(CV_SWITCH, "backtrack", "0", "Enable backtrack",
@@ -174,7 +176,8 @@ void Run()
         {
             bool good_tick = false;
             for (int i = 0; i < 12; ++i)
-                if (t == sorted_ticks[i].tick && sorted_ticks[i].tickcount != INT_MAX)
+                if (t == sorted_ticks[i].tick &&
+                    sorted_ticks[i].tickcount != INT_MAX && sorted_ticks[i].tickcount)
                     good_tick = true;
             if (!good_tick)
                 continue;
diff --git a/src/hacks/Trigger.cpp b/src/hacks/Trigger.cpp
index c302f412..7911e951 100644
--- a/src/hacks/Trigger.cpp
+++ b/src/hacks/Trigger.cpp
@@ -86,7 +86,7 @@ bool CanBacktrack()
     {
         bool good_tick = false;
         for (int j = 0; j < 12; ++j)
-            if (tickcnt == hacks::shared::backtrack::sorted_ticks[j].tick)
+            if (tickcnt == hacks::shared::backtrack::sorted_ticks[j].tick && hacks::shared::backtrack::sorted_ticks[j].tickcount != INT_MAX)
                 good_tick = true;
         tickcnt++;
         if (!good_tick)