From 2794e2151a2677e42d8ccc8def274f263ac5e1dd Mon Sep 17 00:00:00 2001
From: LightCat <BenCat07@gmail.com>
Date: Wed, 1 Aug 2018 21:09:00 +0200
Subject: [PATCH] GUI almost done

---
 data/menu/nullified-ui.xml                  |  7 +-
 data/menu/nullifiedcat/catbot.xml           |  3 +-
 data/menu/nullifiedcat/chat.xml             | 31 +++++++-
 data/menu/nullifiedcat/hackinfo.xml         | 10 +++
 data/menu/nullifiedcat/misc.xml             |  3 +
 data/menu/nullifiedcat/misc/Misc2.xml       |  5 ++
 data/menu/nullifiedcat/misc/achievement.xml |  6 +-
 data/menu/nullifiedcat/misc/anticheat.xml   | 15 ++++
 data/menu/nullifiedcat/misc/collective.xml  | 81 +++++++++++++++++++++
 data/menu/nullifiedcat/misc/remove.xml      |  9 +++
 data/menu/nullifiedcat/spyalert.xml         | 13 ++++
 data/menu/nullifiedcat/visuals.xml          |  1 +
 data/menu/nullifiedcat/visuals/esp.xml      | 23 ++++++
 data/menu/nullifiedcat/visuals/lightesp.xml |  7 ++
 include/hacks/SeedPrediction.hpp            |  2 +
 include/reclasses/C_TEFireBullets.hpp       |  2 +-
 src/hacks/SeedPrediction.cpp                |  2 +
 src/hooks/CreateMove.cpp                    |  5 +-
 src/hooks/visual/FrameStageNotify.cpp       | 25 +++++--
 src/reclasses/C_TEFireBullets.cpp           | 10 +--
 20 files changed, 233 insertions(+), 27 deletions(-)
 create mode 100644 data/menu/nullifiedcat/hackinfo.xml
 create mode 100644 data/menu/nullifiedcat/misc/Misc2.xml
 create mode 100644 data/menu/nullifiedcat/misc/anticheat.xml
 create mode 100644 data/menu/nullifiedcat/misc/collective.xml
 create mode 100644 data/menu/nullifiedcat/misc/remove.xml
 create mode 100644 data/menu/nullifiedcat/spyalert.xml
 create mode 100644 data/menu/nullifiedcat/visuals/lightesp.xml

diff --git a/data/menu/nullified-ui.xml b/data/menu/nullified-ui.xml
index 544c1192..68d15e3f 100644
--- a/data/menu/nullified-ui.xml
+++ b/data/menu/nullified-ui.xml
@@ -8,13 +8,10 @@
             <Include path="nullifiedcat/crits.xml"/>
             <Include path="nullifiedcat/visuals.xml"/>
             <Include path="nullifiedcat/catbot.xml"/>
+            <Include path="nullifiedcat/spyalert.xml"/>
             <Include path="nullifiedcat/misc.xml"/>
+            <Include path="nullifiedcat/hackinfo.xml"/>
             <Include path="nullifiedcat/debug.xml"/>
-            <Tab name="WIP">
-                <List width="150">
-
-                </List>
-            </Tab>
         </TabContainer>
     </Window>
 </ElementGroup>
diff --git a/data/menu/nullifiedcat/catbot.xml b/data/menu/nullifiedcat/catbot.xml
index 4fc93eb2..c22208fa 100755
--- a/data/menu/nullifiedcat/catbot.xml
+++ b/data/menu/nullifiedcat/catbot.xml
@@ -3,6 +3,7 @@
         <List width="200">
             <AutoVariable width="fill" target="autojoin.auto-queue" label="Auto Queue"/>
             <AutoVariable width="fill" target="autoqueue.mode" label="Autoqueue Mode" min="0" max="12"/>
+            <AutoVariable width="fill" target="hack.requeue-on-kick" label="Requeue on kick"/>
             <AutoVariable width="fill" target="autotaunt.enable" label="Autotaunt enabled"/>
             <AutoVariable width="fill" target="autotaunt.chance" label="Autotaunt chance" min="0" max="100"/>
             <LabeledObject width="fill" label="Autojoin Class">
@@ -22,7 +23,7 @@
             <AutoVariable width="fill" target="autojoin.team" label="Autojoin Team" min="0" max="1"/>
         </List>
     </Box>
-    <Box name="CBU" width="content" height="content" padding="12 6 6 6" y="120">
+    <Box name="CBU" width="content" height="content" padding="12 6 6 6" y="130">
         <List width="200">
             <AutoVariable width="fill" target="cat-bot.enable" label="Enable CBU"/>
             <AutoVariable width="fill" target="cat-bot.abandon-if.bots-gte" label="Abandon if bots gte"/>
diff --git a/data/menu/nullifiedcat/chat.xml b/data/menu/nullifiedcat/chat.xml
index aa13aa23..42836dc9 100644
--- a/data/menu/nullifiedcat/chat.xml
+++ b/data/menu/nullifiedcat/chat.xml
@@ -33,7 +33,7 @@
             <AutoVariable width="fill" target="chat.censor.filter" label="Filter"/>
         </List>
     </Box>
-    <Box name="Misc" width="content" height="content" padding="12 6 6 6" x="180" y="60">
+    <Box name="Misc" width="content" height="content" padding="12 6 6 6" x="180" y="50">
         <List width="200">
             <AutoVariable width="fill" target="chat.clean" label="Clean Chat"/>
             <AutoVariable width="fill" target="chat.crypto" label="Crypto Chat"/>
@@ -41,4 +41,33 @@
             <AutoVariable width="fill" target="chat.log-events" label="Log events"/>
         </List>
     </Box>
+    <Box name="Killsay and Chatspam" width="content" height="content" padding="12 6 6 6" y="135" x="220">
+        <List width="200">
+            <AutoVariable width="fill" target="killsay.file" label="Killsay file"/>
+            <LabeledObject width="fill" label="Killsay Mode">
+                <Select target="killsay.mode">
+                    <Option name="Disable" value="0"/>
+                    <Option name="Custom" value="1"/>
+                    <Option name="Default" value="2"/>
+                    <Option name="NCC - Offensive" value="3"/>
+                    <Option name="NCC - MLG" value="4"/>
+                </Select>
+            </LabeledObject>
+            <AutoVariable width="fill" target="spam.filename" label="Spam file"/>
+            <AutoVariable width="fill" target="spam.delay" label="Spam delay"/>
+            <AutoVariable width="fill" target="spam.random" label="Random"/>
+            <LabeledObject width="fill" label="Spam Mode">
+                <Select target="spam.source">
+                    <Option name="Disable" value="0"/>
+                    <Option name="Custom" value="1"/>
+                    <Option name="Default" value="2"/>
+                    <Option name="Lennyfaces" value="3"/>
+                    <Option name="Newlines" value="4"/>
+                    <Option name="Nullcore" value="5"/>
+                    <Option name="Lmaobox" value="6"/>
+                    <Option name="Lithium" value="7"/>
+                </Select>
+            </LabeledObject>
+        </List>
+    </Box>
 </Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/hackinfo.xml b/data/menu/nullifiedcat/hackinfo.xml
new file mode 100644
index 00000000..99155602
--- /dev/null
+++ b/data/menu/nullifiedcat/hackinfo.xml
@@ -0,0 +1,10 @@
+<Tab name="Hack Info" padding="4 4 4 4">
+    <Box height="content" width="content" padding="12 6 6 6">
+        <List width="220">
+            <AutoVariable width="fill" target="hack.enable" label="Enable Cathook"/>
+            <AutoVariable width="fill" target="hack.log-console" label="Log Debug Info"/>
+            <AutoVariable width="fill" target="hack-info.enable" label="Enable Cathook Label"/>
+            <AutoVariable width="fill" target="hack-info.minimal" label="minimal Cathook Label"/>
+        </List>
+    </Box>
+</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc.xml b/data/menu/nullifiedcat/misc.xml
index a84eb8d0..74e1b66a 100644
--- a/data/menu/nullifiedcat/misc.xml
+++ b/data/menu/nullifiedcat/misc.xml
@@ -3,8 +3,11 @@
         <Include path="nullifiedcat/misc/antibackstab.xml"/>
         <Include path="nullifiedcat/misc/achievement.xml"/>
         <Include path="nullifiedcat/misc/autodeadringer.xml"/>
+        <Include path="nullifiedcat/misc/anticheat.xml"/>
         <Include path="nullifiedcat/misc/announcer.xml"/>
         <Include path="nullifiedcat/misc/bhop.xml"/>
         <Include path="nullifiedcat/misc/bptf.xml"/>
+        <Include path="nullifiedcat/misc/collective.xml"/>
+        <Include path="nullifiedcat/misc/Misc2.xml"/>
     </TabContainer>
 </Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc/Misc2.xml b/data/menu/nullifiedcat/misc/Misc2.xml
new file mode 100644
index 00000000..c99a8fcf
--- /dev/null
+++ b/data/menu/nullifiedcat/misc/Misc2.xml
@@ -0,0 +1,5 @@
+<Tab name="Misc2">
+    <TabContainer width="fill" height="fill">
+        <Include path="nullifiedcat/misc/remove.xml"/>
+    </TabContainer>
+</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc/achievement.xml b/data/menu/nullifiedcat/misc/achievement.xml
index 68cd06d7..1a0c06cf 100644
--- a/data/menu/nullifiedcat/misc/achievement.xml
+++ b/data/menu/nullifiedcat/misc/achievement.xml
@@ -1,5 +1,5 @@
 <Tab name="Achievment" padding="4 4 4 4">
-        <List width="150">
-            <AutoVariable width="fill" target="achievement.safety" label="Achievement safety"/>
-        </List>
+    <List width="150">
+        <AutoVariable width="fill" target="achievement.safety" label="Achievement safety"/>
+    </List>
 </Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc/anticheat.xml b/data/menu/nullifiedcat/misc/anticheat.xml
new file mode 100644
index 00000000..f1adc01e
--- /dev/null
+++ b/data/menu/nullifiedcat/misc/anticheat.xml
@@ -0,0 +1,15 @@
+<Tab name="Anticheat" padding="4 4 4 4">
+    <Box height="content" width="content" padding="12 6 6 6">
+        <List width="220">
+            <AutoVariable width="fill" target="find-cheaters.enable" label="Enable AntiCheat"/>
+            <AutoVariable width="fill" target="find-cheaters.accuse-in-chat" label="Accuse in chat"/>
+            <AutoVariable width="fill" target="find-cheaters.ignore-local" label="Ignore Local"/>
+            <AutoVariable width="fill" target="find-cheaters.auto-rage" label="Auto rage"/>
+            <AutoVariable width="fill" target="find-cheaters.aimbot.enable" label="Aimbot Detection"/>
+            <AutoVariable width="fill" target="find-cheaters.aimbot.angle" label="Aimbot Detection Angle"/>
+            <AutoVariable width="fill" target="find-cheaters.aimbot.detections" label="Minimum Aimbot Detections"/>
+            <AutoVariable width="fill" target="find-cheaters.antiaim.enable" label="AntiAim detection"/>
+            <AutoVariable width="fill" target="find-cheaters.bunnyhop.detections" label="Minimum Bhop detections"/>
+        </List>
+    </Box>
+</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc/collective.xml b/data/menu/nullifiedcat/misc/collective.xml
new file mode 100644
index 00000000..60cd93c3
--- /dev/null
+++ b/data/menu/nullifiedcat/misc/collective.xml
@@ -0,0 +1,81 @@
+<Tab name="Collective" padding="4 4 4 4">
+    <Box height="content" width="content" padding="12 6 6 6">
+        <List width="220">
+            <AutoVariable width="fill" target="misc.anti-afk" label="Enable Antiafk"/>
+            <AutoVariable width="fill" target="misc.auto-abandon" label="Enable Auto abandon"/>
+            <AutoVariable width="fill" target="misc.auto-balance-spam" label="Enable Auto balance spam"/>
+            <AutoVariable width="fill" target="misc.debug-info" label="debug"/>
+            <AutoVariable width="fill" target="misc.die-if-vac" label="Crash on VAC"/>
+            <AutoVariable width="fill" target="misc.disconnect-reason" label="Disconnect reason"/>
+            <AutoVariable width="fill" target="misc.engine-prediction" label="Engine Prediction"/>
+            <AutoVariable width="fill" target="misc.flashlight-spam" label="Flashlight spam"/>
+            <AutoVariable width="fill" target="misc.force-halloween" label="Force Halloween"/>
+            <AutoVariable width="fill" target="misc.god-mode" label="xd"/>
+            <AutoVariable width="fill" target="misc.minigun-jump-tf2c" label="TF2C Minigun Jump"/>
+            <AutoVariable width="fill" target="misc.no-homo" label="#nohomo"/>
+            <AutoVariable width="fill" target="misc.no-lerp" label="nolerp"/>
+            <AutoVariable width="fill" target="misc.no-push" label="nopush"/>
+            <AutoVariable width="fill" target="misc.roll-speedhack" label="Rollspeedhack"/>
+            <AutoVariable width="fill" target="misc.semi-auto" label="Semiauto Fire"/>
+            <AutoVariable width="fill" target="misc.show-spectators" label="Show spectators"/>
+            <LabeledObject width="fill" label="Skybox Override">
+                <Select target="misc.skybox-override">
+                    <Option name="sky_tf2_04" value="0"/>
+                    <Option name="sky_upward" value="1"/>
+                    <Option name="sky_dustbowl_01" value="2"/>
+                    <Option name="sky_goldrush_01" value="3"/>
+                    <Option name="sky_granary_01" value="4"/>
+                    <Option name="sky_well_01" value="5"/>
+                    <Option name="sky_gravel_01" value="6"/>
+                    <Option name="sky_badlands_01" value="7"/>
+                    <Option name="sky_hydro_01" value="8"/>
+                    <Option name="sky_night_01" value="9"/>
+                    <Option name="sky_nightfall_01" value="10"/>
+                    <Option name="sky_trainyard_01" value="11"/>
+                    <Option name="sky_stormfront_01" value="12"/>
+                    <Option name="sky_morningsnow_01" value="13"/>
+                    <Option name="sky_alpinestorm_01" value="14"/>
+                    <Option name="sky_harvest_01" value="15"/>
+                    <Option name="sky_harvest_night_01" value="16"/>
+                    <Option name="sky_halloween" value="17"/>
+                    <Option name="sky_halloween_night_01" value="18"/>
+                    <Option name="sky_halloween_night2014_01" value="19"/>
+                    <Option name="sky_island_01" value="20"/>
+                    <Option name="sky_jungle_01" value="21"/>
+                    <Option name="sky_invasion2fort_01" value="22"/>
+                    <Option name="sky_well_02" value="23"/>
+                    <Option name="sky_outpost_01" value="24"/>
+                    <Option name="sky_coastal_01" value="25"/>
+                    <Option name="sky_rainbow_01" value="26"/>
+                    <Option name="sky_badlands_pyroland_01" value="27"/>
+                    <Option name="sky_pyroland_01" value="28"/>
+                    <Option name="sky_pyroland_02" value="29"/>
+                    <Option name="sky_pyroland_03" value="30"/>
+                </Select>
+            </LabeledObject>
+            <AutoVariable width="fill" target="misc.tauntslide" label="Tauntslide"/>
+            <AutoVariable width="fill" target="misc.tauntslide-tf2c" label="TF2C Tauntslide"/>
+            <AutoVariable width="fill" target="name.custom" label="Custom name"/>
+            <AutoVariable width="fill" target="name.custom.ipc" label="IPC name"/>
+            <LabeledObject width="fill" label="Namesteal">
+                <Select target="name.namesteal">
+                    <Option name="Disabled" value="0"/>
+                    <Option name="Passive" value="1"/>
+                    <Option name="Active" value="2"/>
+                </Select>
+            </LabeledObject>
+        </List>
+        <List width="220" x="232">
+            <AutoVariable width="fill" target="noisemaker-spam.enable" label="Noisemaker spam"/>
+            <AutoVariable width="fill" target="online.enable" label="Enable cathook online"/>
+            <AutoVariable width="fill" target="player-tools.betrayal-limit" label="Betrayal Limit"/>
+            <AutoVariable width="fill" target="player-tools.ignore.online.notarget" label="Don't target Users"/>
+            <AutoVariable width="fill" target="player-tools.ignore.hoovy" label="Ignore Hoovies"/>
+            <AutoVariable width="fill" target="player-tools.ignore.online.anonymous" label="Ignore Anonymous"/>
+            <AutoVariable width="fill" target="player-tools.ignore.online.friendly-software" label="Ignore Friendly software"/>
+            <AutoVariable width="fill" target="player-tools.ignore.online.only-verified-accounts" label="Only ignore Verified Accounts"/>
+            <AutoVariable width="fill" target="player-tools.ignore.taunting" label="Ignore Taunting Players"/>
+            <AutoVariable width="fill" target="killstreak.enable" label="Enable Killstreak"/>
+        </List>
+    </Box>
+</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc/remove.xml b/data/menu/nullifiedcat/misc/remove.xml
new file mode 100644
index 00000000..58a5f29a
--- /dev/null
+++ b/data/menu/nullifiedcat/misc/remove.xml
@@ -0,0 +1,9 @@
+<Tab name="Remove" padding="4 4 4 4">
+    <List width="220">
+        <AutoVariable width="fill" target="remove.arms" label="Remove Arms"/>
+        <AutoVariable width="fill" target="remove.cloak" label="Remove Cloak"/>
+        <AutoVariable width="fill" target="remove.disguise" label="Remove Disguise"/>
+        <AutoVariable width="fill" target="remove.hats" label="Remove Hats"/>
+        <AutoVariable width="fill" target="remove.scope" label="Remove Scope"/>
+    </List>
+</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/spyalert.xml b/data/menu/nullifiedcat/spyalert.xml
new file mode 100644
index 00000000..ebe3aa49
--- /dev/null
+++ b/data/menu/nullifiedcat/spyalert.xml
@@ -0,0 +1,13 @@
+<Tab name="Spy alert" padding="4 4 4 4">
+    <Box padding="12 6 6 6" width="content" height="content">
+        <List width="250">
+            <AutoVariable width="fill" target="spy-alert.enable" label="Enable"/>
+            <AutoVariable width="fill" target="spy-alert.voicemenu" label="Call out spy"/>
+            <AutoVariable width="fill" target="spy-alert.sound" label="Sound"/>
+            <AutoVariable width="fill" target="spy-alert.alert-interval" label="Interval"/>
+            <AutoVariable width="fill" target="spy-alert.alert-for-invisible" label="Alert for invis spies"/>
+            <AutoVariable width="fill" target="spy-alert.distance.alert" label="Alert Distance"/>
+            <AutoVariable width="fill" target="spy-alert.distance.warning" label="Backstab Warning Distance"/>
+        </List>
+    </Box>
+</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/visuals.xml b/data/menu/nullifiedcat/visuals.xml
index 342d422a..c10ded33 100644
--- a/data/menu/nullifiedcat/visuals.xml
+++ b/data/menu/nullifiedcat/visuals.xml
@@ -1,6 +1,7 @@
 <Tab name="Visuals">
     <TabContainer width="fill" height="fill">
         <Include path="nullifiedcat/visuals/esp.xml"/>
+        <Include path="nullifiedcat/visuals/lightesp.xml"/>
         <Include path="nullifiedcat/visuals/glow.xml"/>
         <Include path="nullifiedcat/visuals/chams.xml"/>
         <Include path="nullifiedcat/visuals/radar.xml"/>
diff --git a/data/menu/nullifiedcat/visuals/esp.xml b/data/menu/nullifiedcat/visuals/esp.xml
index aa1bddcd..8bea3cfd 100644
--- a/data/menu/nullifiedcat/visuals/esp.xml
+++ b/data/menu/nullifiedcat/visuals/esp.xml
@@ -8,7 +8,18 @@
             <AutoVariable width="fill" target="esp.box.player-3d" label="3D Players"/>
             <AutoVariable width="fill" target="esp.box.corner-size" label="Corner Size"/>
             <AutoVariable width="fill" target="esp.bones" label="Bone ESP"/>
+            <AutoVariable width="fill" target="esp.sightlines" label="Sightlines"/>
+            <AutoVariable width="fill" target="esp.show.teammates" label="Teammate ESP"/>
             <AutoVariable width="fill" target="esp.expand" label="Expand"/>
+            <LabeledObject width="fill" label="Text Position">
+                <Select target="esp.text-position">
+                    <Option name="Top right" value="0"/>
+                    <Option name="Bottom Right" value="1"/>
+                    <Option name="Center" value="2"/>
+                    <Option name="Above" value="3"/>
+                    <Option name="Below" value="4"/>
+                </Select>
+            </LabeledObject>
             <LabeledObject width="fill" label="Box mode">
                 <Select target="esp.box.mode">
                     <Option name="None" value="0"/>
@@ -16,6 +27,13 @@
                     <Option name="Corners" value="2"/>
                 </Select>
             </LabeledObject>
+            <LabeledObject width="fill" label="Tracer mode">
+                <Select target="esp.tracers-mode">
+                    <Option name="Off" value="0"/>
+                    <Option name="Center" value="1"/>
+                    <Option name="bottom" value="2"/>
+                </Select>
+            </LabeledObject>
             <LabeledObject width="fill" label="Health mode">
                 <Select target="esp.health-mode">
                     <Option name="None" value="0"/>
@@ -68,6 +86,8 @@
             <AutoVariable width="fill" target="esp.online.software" label="Online: Software"/>
         </List>
         <List width="150" x="320">
+            <AutoVariable width="fill" target="esp.projectile.enable" label="Enable Projectile ESP"/>
+            <AutoVariable width="fill" target="esp.projectile.enemy-only" label="Only Enemy projectiles"/>
             <AutoVariable width="fill" target="esp.item.enable" label="Enable Item ESP"/>
             <AutoVariable width="fill" target="esp.item.ammo" label="Ammo Packs"/>
             <AutoVariable width="fill" target="esp.item.health" label="Health Packs"/>
@@ -77,6 +97,9 @@
             <AutoVariable width="fill" target="esp.item.spellbook" label="Spellbooks"/>
             <AutoVariable width="fill" target="esp.item.weapons" label="HL2:DM Weapons"/>
             <AutoVariable width="fill" target="esp.item.adrenaline" label="TF2C Adrenaline"/>
+            <AutoVariable width="fill" target="esp.show.buildings" label="Building ESP"/>
+            <AutoVariable width="fill" target="esp.show.local" label="ESP on local player"/>
+            <AutoVariable width="fill" target="esp.show.tank" label="Tank ESP"/>
             <AutoVariable width="fill" target="esp.item.weapon-spawner" label="TC2C Weapon Spawner"/>
         </List>
     </Box>
diff --git a/data/menu/nullifiedcat/visuals/lightesp.xml b/data/menu/nullifiedcat/visuals/lightesp.xml
new file mode 100644
index 00000000..5de92b46
--- /dev/null
+++ b/data/menu/nullifiedcat/visuals/lightesp.xml
@@ -0,0 +1,7 @@
+<Tab name="Light ESP" padding="4 4 4 4">
+    <Box padding="12 6 6 6" width="content" height="content">
+        <List width="150">
+            <AutoVariable width="fill" target="lightesp.enable" label="Enable"/>
+        </List>
+    </Box>
+</Tab>
\ No newline at end of file
diff --git a/include/hacks/SeedPrediction.hpp b/include/hacks/SeedPrediction.hpp
index 8d4e303e..b01c83d9 100644
--- a/include/hacks/SeedPrediction.hpp
+++ b/include/hacks/SeedPrediction.hpp
@@ -8,9 +8,11 @@
 #include "reclasses.hpp"
 #include "C_TEFireBullets.hpp"
 #include "common.hpp"
+#include <settings/Bool.hpp>
 #pragma once
 namespace hacks::tf2::seedprediction
 {
+	extern settings::Bool prediction;
 	void handleFireBullets(C_TEFireBullets *);
 	struct seedstruct
 	{
diff --git a/include/reclasses/C_TEFireBullets.hpp b/include/reclasses/C_TEFireBullets.hpp
index 5d0cbb2a..c4fbbf9a 100644
--- a/include/reclasses/C_TEFireBullets.hpp
+++ b/include/reclasses/C_TEFireBullets.hpp
@@ -10,7 +10,7 @@ class C_TEFireBullets : public C_BaseTempEntity
 {
 public:
 	C_TEFireBullets() = delete;
-	static C_TEFireBullets *GTEFireBullets();
+	static C_BaseTempEntity *GTEFireBullets();
 
 public:
 	int m_iSeed();
diff --git a/src/hacks/SeedPrediction.cpp b/src/hacks/SeedPrediction.cpp
index d79a08bf..ed5b0a6a 100644
--- a/src/hacks/SeedPrediction.cpp
+++ b/src/hacks/SeedPrediction.cpp
@@ -4,6 +4,7 @@
  *  Created on: Jul 27, 2018
  *      Author: bencat07
  */
+#include <settings/Bool.hpp>
 #include "common.hpp"
 #include "SeedPrediction.hpp"
 #include "reclasses.hpp"
@@ -13,6 +14,7 @@ double clockRes;
 float seedFraction = 0.0f;
 namespace hacks::tf2::seedprediction
 {
+	settings::Bool prediction{"seed-prediction.enable", "false"};
 	buf bases{9999};
 	buf2 rebased{9999};
 	buf3 intervals{9999};
diff --git a/src/hooks/CreateMove.cpp b/src/hooks/CreateMove.cpp
index 696b69c4..735d0514 100644
--- a/src/hooks/CreateMove.cpp
+++ b/src/hooks/CreateMove.cpp
@@ -8,6 +8,7 @@
 #include "common.hpp"
 #include "hack.hpp"
 #include "MiscTemporary.hpp"
+#include "SeedPrediction.hpp"
 #include <link.h>
 #include <hacks/hacklist.hpp>
 #include <settings/Bool.hpp>
@@ -16,7 +17,7 @@
 #include "HookedMethods.hpp"
 
 static settings::Bool minigun_jump{ "misc.minigun-jump-tf2c", "false" };
-static settings::Button roll_speedhack{ "misc.roll-speedhack", "false" };
+static settings::Bool roll_speedhack{ "misc.roll-speedhack", "false" };
 static settings::Bool engine_pred{ "misc.engine-prediction", "false" };
 static settings::Bool debug_projectiles{ "debug.projectiles", "false" };
 static settings::Int semiauto{ "misc.semi-auto", "0" };
@@ -418,7 +419,7 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
     if (CE_GOOD(g_pLocalPlayer->entity))
     {
         speedapplied = false;
-        if (roll_speedhack.isKeyDown() &&
+        if (roll_speedhack && cmd->buttons & IN_DUCK &&
             !(cmd->buttons & IN_ATTACK))
         {
             speed = cmd->forwardmove;
diff --git a/src/hooks/visual/FrameStageNotify.cpp b/src/hooks/visual/FrameStageNotify.cpp
index 517aee3a..ecec8382 100644
--- a/src/hooks/visual/FrameStageNotify.cpp
+++ b/src/hooks/visual/FrameStageNotify.cpp
@@ -19,7 +19,6 @@ static float old_nightmode{ 0.0f };
 namespace hooked_methods
 {
 #include "reclasses.hpp"
-#include "C_TEFireBullets.hpp"
 DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_,
                      ClientFrameStage_t stage)
 {
@@ -93,14 +92,24 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_,
             ipc::UpdateServerAddress();
 #endif
         }
-        C_TEFireBullets *fire = C_TEFireBullets::GTEFireBullets();
-        if (fire && !hooks::IsHooked((void *)fire))
-        {
-        	hooks::firebullets.Set(fire);
-        	hooks::firebullets.HookMethod(HOOK_ARGS(PreDataUpdate));
-        	hooks::firebullets.Apply();
-        }
     }
+    /*if (hacks::tf2::seedprediction::prediction && CE_GOOD(LOCAL_E)) {
+        C_BaseTempEntity *fire = C_TEFireBullets::GTEFireBullets();
+        while (fire) {
+            logging::Info("0x%08X", (uintptr_t) fire);
+            C_TEFireBullets *fire2 = nullptr;
+            if (!fire->IsDormant() && fire->GetClientNetworkable()->GetClientClass() && fire->GetClientNetworkable()->GetClientClass()->m_ClassID == CL_CLASS(CTEFireBullets))
+                fire2 = (C_TEFireBullets *) fire;
+            if (fire2 && !hooks::IsHooked((void *) fire2)) {
+                hooks::firebullets.Set(fire2);
+                hooks::firebullets.HookMethod(HOOK_ARGS(PreDataUpdate));
+                hooks::firebullets.Apply();
+            }
+            if (fire2)
+                logging::Info("%d", fire2->m_iSeed());
+            fire = fire->m_pNext;
+        }
+    }*/
     if (isHackActive() && !g_Settings.bInvalid && stage == FRAME_RENDER_START)
     {
         IF_GAME(IsTF())
diff --git a/src/reclasses/C_TEFireBullets.cpp b/src/reclasses/C_TEFireBullets.cpp
index 571949cd..da02dd8d 100644
--- a/src/reclasses/C_TEFireBullets.cpp
+++ b/src/reclasses/C_TEFireBullets.cpp
@@ -7,13 +7,11 @@
 #include "reclasses.hpp"
 #pragma once
 
-C_TEFireBullets *C_TEFireBullets::GTEFireBullets()
+C_BaseTempEntity *C_TEFireBullets::GTEFireBullets()
 {
-	typedef C_TEFireBullets *(*GTEFireBullets_t)();
-	static uintptr_t addr1 = gSignatures.GetClientSignature("55 B8 ? ? ? ? 89 E5 5D C3 8D B6 00 00 00 00 55 89 E5 56 53 83 EC ? C7 45");
-	GTEFireBullets_t GTEFireBullets_fn = GTEFireBullets_t(addr1);
-
-	return GTEFireBullets_fn();
+    static uintptr_t fireaddr = (gSignatures.GetClientSignature("C7 40 ? ? ? ? ? C7 40 ? ? ? ? ? A3 ? ? ? ? 89 50") - 0x4);
+    C_BaseTempEntity * fire = *(C_BaseTempEntity **)fireaddr;
+	return fire;
 }
 int C_TEFireBullets::m_iSeed()
 {