Merge pull request #19 from nullifiedcat/master

Update fork

check-data

@@ -5,5 +5,6 @@ if ! [ -d "$1" ]; then
 	sudo mkdir -p "$1"
 	sudo chown -R $USER "$1"
 	sudo chmod -R 777 "$1"
-	rsync -avh --progress "data/" "$1"
 fi
+
+rsync -avh --progress "data/" "$1"

data/menu.json

@@ -10,8 +10,12 @@
 			"aimbot_hitboxmode",
 			"aimbot_fov",
 			"aimbot_fov_draw",
+			"aimbot_fov_draw_opacity",
 			"aimbot_prioritymode",
 			"aimbot_charge",
+			"aimbot_auto_unzoom",
+			"aimbot_auto_zoom",
+			"aimbot_rage_only",
 			{
 				"type": "list",
 				"name": "Ignore",
@@ -42,6 +46,7 @@
 				"type": "list",
 				"name": "Preferences",
 				"list": [
+					"aimbot_miss_chance",
 					"aimbot_silent",
 					"aimbot_target_lock",
 					"aimbot_hitbox",
@@ -182,6 +187,7 @@
 					"esp_entity",
 					"esp_model_name",
 					"esp_entity_id",
+					"esp_spellbooks",
 					{
 						"type": "list",
 						"name": "Colors",
@@ -285,7 +291,8 @@
 					"glow_medkits",
 					"glow_ammo",
 					"glow_stickies",
-					"glow_powerups"
+					"glow_powerups",
+					"glow_weapons_white"
 				]
 			},
 			{
@@ -392,7 +399,11 @@
 			"uberspam_build",
 			"uberspam_file",
 			"spam_voicecommand",
-			"spam_teamname"
+			"spam_teamname",
+			"chat_log",
+			"chat_log_noipc",
+			"chat_log_nospam",
+			"chat_log_template"
 		]
 	},
 	{
@@ -428,6 +439,11 @@
 		"type": "list",
 		"name": "Miscellaneous",
 		"list": [
+			"autotaunt",
+			"autotaunt_chance",
+			"autojoin_team",
+			"autojoin_class",
+			"autoqueue",
 			"events",
 			"airstuck",
 			"instant_weapon_switch",

src/drawmgr.cpp

@@ -56,6 +56,9 @@ void DrawCheatVisuals() {
 				}
 			}
 		}
+		if (spectator_target) {
+			AddCenterString("Press SPACE to stop spectating");
+		}
 		if (CE_GOOD(g_pLocalPlayer->entity) && !g_Settings.bInvalid) {
 			PROF_SECTION(PT_total_hacks);
 			{

src/gui/im/Playerlist.cpp

@@ -127,6 +127,10 @@ void RenderPlayer(int eid) {
 		}
 		x += 200;
 		ImGui::PopItemWidth();
+		ImGui::SameLine(x);
+		if (ImGui::Button("Spectate")) {
+			spectator_target = eid;
+		}
 	}
 	ImGui::PopID();
 }

src/hack.cpp

@@ -162,6 +162,7 @@ void hack::CC_Cat(const CCommand& args) {
 }
 
 void hack::Initialize() {
+	signal(SIGPIPE, SIG_IGN);
 	time_injected = time(nullptr);
 	// Essential files must always exist, except when the game is running in text mode.
 #if ENABLE_VISUALS == 1

src/hacks/ESP.cpp

@@ -44,7 +44,7 @@ CatVar buildings(CV_SWITCH, "esp_buildings", "1", "Building ESP", "Show building
 CatVar teammates(CV_SWITCH, "esp_teammates", "0", "ESP Teammates", "Teammate ESP");
 CatVar tank(CV_SWITCH, "esp_show_tank", "1", "Show tank", "Show tanks in mvm");
 // Text Esps
-CatVar show_weapon(CV_SWITCH, "esp_weapon", "1", "Show weapon name", "Show which weapon the enemy is using");
+CatVar show_weapon(CV_SWITCH, "esp_weapon", "0", "Show weapon name", "Show which weapon the enemy is using");
 CatVar show_distance(CV_SWITCH, "esp_distance", "1", "Distance ESP", "Show distance to target");
 CatVar show_name(CV_SWITCH, "esp_name", "1", "Name ESP", "Show name");
 CatVar show_class(CV_SWITCH, "esp_class", "1", "Class ESP", "Show class");

src/hooks/others.cpp

@@ -95,7 +95,7 @@ CatVar override_fov(CV_FLOAT, "fov", "0", "FOV override", "Overrides FOV with th
 CatVar freecam(CV_KEY, "debug_freecam", "0", "Freecam");
 int spectator_target { 0 };
 
-CatCommand spectate("debug_spectate", "Spectate", [](const CCommand& args) {
+CatCommand spectate("spectate", "Spectate", [](const CCommand& args) {
 	if (args.ArgC() < 1) {
 		spectator_target = 0;
 		return;
@@ -132,6 +132,9 @@ void OverrideView_hook(void* _this, CViewSetup* setup) {
 				setup->angles = CE_VAR(spec, netvar.m_angEyeAngles, QAngle);
 			}
 		}
+		if (g_IInputSystem->IsButtonDown(ButtonCode_t::KEY_SPACE)) {
+			spectator_target = 0;
+		}
 	}
 
 	if (freecam) {