From 8a1df6378d5372e8fd05d590fd9b553a5dc6e52b Mon Sep 17 00:00:00 2001
From: LightCat <BenCat07@gmail.com>
Date: Thu, 2 Aug 2018 12:38:38 +0200
Subject: [PATCH] Last XML

---
 data/menu/nullifiedcat/visuals.xml      |  1 +
 data/menu/nullifiedcat/visuals/misc.xml | 23 +++++++++++++++++++++++
 src/crits.cpp                           |  2 +-
 src/hacks/ac/aimbot.cpp                 | 11 ++++++-----
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 data/menu/nullifiedcat/visuals/misc.xml

diff --git a/data/menu/nullifiedcat/visuals.xml b/data/menu/nullifiedcat/visuals.xml
index c10ded33..61766dd0 100644
--- a/data/menu/nullifiedcat/visuals.xml
+++ b/data/menu/nullifiedcat/visuals.xml
@@ -5,5 +5,6 @@
         <Include path="nullifiedcat/visuals/glow.xml"/>
         <Include path="nullifiedcat/visuals/chams.xml"/>
         <Include path="nullifiedcat/visuals/radar.xml"/>
+        <Include path="nullifiedcat/visuals/misc.xml"/>
     </TabContainer>
 </Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/visuals/misc.xml b/data/menu/nullifiedcat/visuals/misc.xml
new file mode 100644
index 00000000..4a75ca6d
--- /dev/null
+++ b/data/menu/nullifiedcat/visuals/misc.xml
@@ -0,0 +1,23 @@
+<Tab name="Misc Visuals" padding="4 4 4 4">
+    <List width="150">
+        <AutoVariable width="fill" target="visual.clean-screenshots" label="Clean Screenshots"/>
+        <AutoVariable width="fill" target="visual.disable" label="Disable Visuals"/>
+        <AutoVariable width="fill" target="visual.fov" label="FOV"/>
+        <AutoVariable width="fill" target="visual.fov-zoomed" label="FOV zoomed"/>
+        <AutoVariable width="fill" target="visual.freecam-button" label="Freecam button"/>
+        <AutoVariable width="fill" target="visual.medal-flip" label="Guranteed Medal flip"/>
+        <AutoVariable width="fill" target="visual.night-mode" label="Nightmode" min="0" max="100"/>
+        <AutoVariable width="fill" target="visual.open-gui-button" label="GUI button"/>
+        <LabeledObject width="fill" label="Software cursor mode">
+            <Select target="visual.software-cursor-mode">
+                <Option name="Keep" value="0"/>
+                <Option name="Always" value="1"/>
+                <Option name="Never" value="2"/>
+                <Option name="Menu on" value="3"/>
+            </Select>
+        </LabeledObject>
+        <AutoVariable width="fill" target="visual.sv-pure-bypass" label="SV Pure bypass"/>
+        <AutoVariable width="fill" target="visual.thirdperson.enable" label="Thirdperson"/>
+        <AutoVariable width="fill" target="visual.thirdperson.real-angles" label="Show Angles in thirdperson"/>
+    </List>
+</Tab>
\ No newline at end of file
diff --git a/src/crits.cpp b/src/crits.cpp
index 7acc1b1c..e2ec3ee5 100644
--- a/src/crits.cpp
+++ b/src/crits.cpp
@@ -115,7 +115,7 @@ bool force_crit(IClientEntity *weapon)
     //              number);
     lastweapon = weapon->GetModel();
     lastnumber = number;
-    if (crit_experimental)
+    if (crit_experimental && GetWeaponMode() != weapon_melee)
     {
         if (!crit_legiter)
         {
diff --git a/src/hacks/ac/aimbot.cpp b/src/hacks/ac/aimbot.cpp
index 265c5dd9..f02454af 100644
--- a/src/hacks/ac/aimbot.cpp
+++ b/src/hacks/ac/aimbot.cpp
@@ -110,11 +110,12 @@ void Event(KeyValues *event)
         {
             CachedEntity *victim   = ENTITY(vid);
             CachedEntity *attacker = ENTITY(eid);
-            if (victim->m_vecOrigin().DistTo(attacker->m_vecOrigin()) > 250)
-            {
-                data_table[eid - 1].check_timer = 1;
-                data_table[eid - 1].last_weapon = event->GetInt("weaponid");
-            }
+            if (CE_GOOD(victim) && CE_GOOD(attacker))
+                if (victim->m_vecOrigin().DistTo(attacker->m_vecOrigin()) > 250)
+                {
+                    data_table[eid - 1].check_timer = 1;
+                    data_table[eid - 1].last_weapon = event->GetInt("weaponid");
+                }
         }
     }
 }