From 0d3dd2bf2edfcfec7749056b9b4f67327e070927 Mon Sep 17 00:00:00 2001 From: GAMMACASE Date: Sun, 7 Mar 2021 05:58:38 +0300 Subject: [PATCH 1/2] Removed restart warning for a segmented style --- addons/sourcemod/scripting/shavit-misc.sp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp index 41f06b80..7c1c68c0 100644 --- a/addons/sourcemod/scripting/shavit-misc.sp +++ b/addons/sourcemod/scripting/shavit-misc.sp @@ -2665,7 +2665,9 @@ bool DeleteCheckpoint(int client, int index) bool ShouldDisplayStopWarning(int client) { - return (gCV_StopTimerWarning.BoolValue && Shavit_GetTimerStatus(client) != Timer_Stopped && Shavit_GetClientTime(client) > gCV_StopTimerWarning.FloatValue); + char special[sizeof(stylestrings_t::sSpecialString)]; + Shavit_GetStyleStrings(Shavit_GetBhopStyle(client), sSpecialString, special, sizeof(special)); + return (gCV_StopTimerWarning.BoolValue && Shavit_GetTimerStatus(client) != Timer_Stopped && Shavit_GetClientTime(client) > gCV_StopTimerWarning.FloatValue && StrContains(special, "segments") == -1); } void DoNoclip(int client) From a78d797d4205c953a66469ebaae0f5be9886fbc0 Mon Sep 17 00:00:00 2001 From: Joe <55846624+rtldg@users.noreply.github.com> Date: Sun, 7 Mar 2021 03:29:18 +0000 Subject: [PATCH 2/2] use existing CanSegment(client) --- addons/sourcemod/scripting/shavit-misc.sp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp index 7c1c68c0..5304051d 100644 --- a/addons/sourcemod/scripting/shavit-misc.sp +++ b/addons/sourcemod/scripting/shavit-misc.sp @@ -2665,9 +2665,7 @@ bool DeleteCheckpoint(int client, int index) bool ShouldDisplayStopWarning(int client) { - char special[sizeof(stylestrings_t::sSpecialString)]; - Shavit_GetStyleStrings(Shavit_GetBhopStyle(client), sSpecialString, special, sizeof(special)); - return (gCV_StopTimerWarning.BoolValue && Shavit_GetTimerStatus(client) != Timer_Stopped && Shavit_GetClientTime(client) > gCV_StopTimerWarning.FloatValue && StrContains(special, "segments") == -1); + return (gCV_StopTimerWarning.BoolValue && Shavit_GetTimerStatus(client) != Timer_Stopped && Shavit_GetClientTime(client) > gCV_StopTimerWarning.FloatValue && !CanSegment(client)); } void DoNoclip(int client)