From ecbc7edca2998c6728dea37f26966c6b8c835599 Mon Sep 17 00:00:00 2001
From: rtldg <55846624+rtldg@users.noreply.github.com>
Date: Sat, 15 Jan 2022 12:49:09 +0000
Subject: [PATCH] add back reset checkpoints option when tas menu stuff

---
 .../sourcemod/scripting/shavit-checkpoints.sp |  7 ++-----
 addons/sourcemod/scripting/shavit-tas.sp      | 21 +++++++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/addons/sourcemod/scripting/shavit-checkpoints.sp b/addons/sourcemod/scripting/shavit-checkpoints.sp
index 43de7e3b..a9f92282 100644
--- a/addons/sourcemod/scripting/shavit-checkpoints.sp
+++ b/addons/sourcemod/scripting/shavit-checkpoints.sp
@@ -1124,11 +1124,8 @@ void OpenNormalCPMenu(int client)
 	FormatEx(sDisplay, 64, "%T", "MiscCheckpointDeleteCurrent", client);
 	menu.AddItem("del", sDisplay, (gA_Checkpoints[client].Length > 0) ? ITEMDRAW_DEFAULT:ITEMDRAW_DISABLED);
 
-	if (!tas_timescale)
-	{
-		FormatEx(sDisplay, 64, "%T", "MiscCheckpointReset", client);
-		menu.AddItem("reset", sDisplay);
-	}
+	FormatEx(sDisplay, 64, "%T", "MiscCheckpointReset", client);
+	menu.AddItem("reset", sDisplay);
 
 	if(!bSegmented)
 	{
diff --git a/addons/sourcemod/scripting/shavit-tas.sp b/addons/sourcemod/scripting/shavit-tas.sp
index 7cf3a3a6..c75b7dd1 100644
--- a/addons/sourcemod/scripting/shavit-tas.sp
+++ b/addons/sourcemod/scripting/shavit-tas.sp
@@ -299,26 +299,21 @@ public Action Shavit_OnCheckpointMenuMade(int client, bool segmented, Menu menu)
 
 	char sDisplay[64];
 	bool tas_timescale = (Shavit_GetStyleSettingFloat(Shavit_GetBhopStyle(client), "tas_timescale") == -1.0);
-	int delcurrentcheckpoint = -1;
+
+	FormatEx(sDisplay, 64, "%T\n ", "TasSettings", client);
 
 	if (tas_timescale)
 	{
-		if ((delcurrentcheckpoint = FindMenuItem(menu, "del")) != -1)
-		{
-			menu.RemoveItem(delcurrentcheckpoint);
-		}
+		int pos = FindMenuItem(menu, "del");
+		menu.InsertItem(pos, "tassettings", sDisplay);
 	}
-
-	FormatEx(sDisplay, 64, "%T\n ", "TasSettings", client);
-	menu.AddItem("tassettings", sDisplay);
-	//menu.ExitButton = false;
-
-	if (delcurrentcheckpoint != -1)
+	else
 	{
-		FormatEx(sDisplay, 64, "%T", "MiscCheckpointDeleteCurrent", client);
-		menu.AddItem("del", sDisplay, (Shavit_GetTotalCheckpoints(client) > 0) ? ITEMDRAW_DEFAULT:ITEMDRAW_DISABLED);
+		menu.AddItem("tassettings", sDisplay);
 	}
 
+	menu.ExitButton = gEV_Type != Engine_CSGO;
+
 	return Plugin_Changed;
 }