expose g_leaderboardOpen and g_leaderboardWillClose, make wakeup reject feature work with sar_disable_challenge_stats_hud values that are not -1

Author: ellzie

src/Features/AutoSubmit.cpp

@@ -1,6 +1,7 @@
 #include "AutoSubmit.hpp"
 
 #include "../Games/Portal2.hpp"
+#include "../Modules/Client.hpp"
 #include "Cheats.hpp"
 #include "Command.hpp"
 #include "Event.hpp"
@@ -29,7 +30,7 @@
 #define OLD_API_KEY_FILE "autosubmit_key.txt"
 
 bool AutoSubmit::g_cheated = false;
-bool AutoSubmit::g_paused = false;
+int AutoSubmit::g_paused = 0;
 std::string AutoSubmit::g_partner_name = "";
 
 ON_EVENT(SESSION_START) {
@@ -48,11 +49,12 @@ ON_INIT {
 
 ON_EVENT(SESSION_START) {
 	AutoSubmit::g_cheated = sv_cheats.GetBool();
+	AutoSubmit::g_paused = 0;
 }
 
 ON_EVENT(PRE_TICK) {
 	if (sv_cheats.GetBool()) AutoSubmit::g_cheated = true;
-	if (engine->IsGamePaused() && SpeedrunTimer::IsRunning()) AutoSubmit::g_paused = true;
+	if (engine->IsGamePaused() && SpeedrunTimer::IsRunning() && !(client->g_leaderboardOpen)) AutoSubmit::g_paused += 1;
 }
 
 static std::string g_api_base;
@@ -583,11 +585,13 @@ void AutoSubmit::FinishRun(float final_time, const char *demopath, std::optional
 		return;
 	}
 
-	if (AutoSubmit::g_paused && engine->GetCurrentMapName() == "sp_a1_wakeup") {
+	int allowedPauses = 0;
+	if (sar_disable_challenge_stats_hud.GetInt() != -1) allowedPauses = 1;
+	if (AutoSubmit::g_paused > allowedPauses && engine->GetCurrentMapName() == "sp_a1_wakeup") {
 		console->Print("Pause Detected in wakeup (pause abuse is not allowed in CM); not autosubmitting\nManually submit this demo if you believe this was a mistake\n");
 		return;
-	}
-
+	}	
+	
 #if defined(SAR_DEV_BUILD)
 	console->Print("Dev SAR build; not autosubmitting\n");
 	return;

src/Features/AutoSubmit.hpp

@@ -6,7 +6,7 @@
 
 namespace AutoSubmit {
 	extern bool g_cheated;
-	extern bool g_paused;
+	extern int g_paused;
 	extern std::string g_partner_name;
 
 	void LoadApiKey(bool output_nonexist);

src/Modules/Client.cpp

@@ -350,18 +350,18 @@ DETOUR_T(const char *, Client::GetName) {
 	return Client::GetName(thisptr);
 }
 
-static bool g_leaderboardOpen = false;
-static bool g_leaderboardWillClose = false;
+bool g_leaderboardOpen = false;
+bool g_leaderboardWillClose = false;
 DETOUR_COMMAND(Client::openleaderboard) {
 	Client::openleaderboard_callback(args);
 
 	if (args.ArgC() == 2 && !strcmp(args[1], "4") && client->GetChallengeStatus() == CMStatus::CHALLENGE) {
-		g_leaderboardOpen = true;
+		client->g_leaderboardOpen = true;
 		auto ticks = 6;
 		if (sar_disable_challenge_stats_hud.GetInt() > 1) ticks = sar_disable_challenge_stats_hud.GetInt();
 		Scheduler::InHostTicks(ticks, []() {
-			if (sar.game->Is(SourceGame_Portal2) && sar_disable_challenge_stats_hud.GetInt() > 0 && (!engine->IsCoop() || engine->IsOrange() || g_leaderboardWillClose)) {
-				g_leaderboardWillClose = false;
+			if (sar.game->Is(SourceGame_Portal2) && sar_disable_challenge_stats_hud.GetInt() > 0 && (!engine->IsCoop() || engine->IsOrange() || client->g_leaderboardWillClose)) {
+				client->g_leaderboardWillClose = false;
 				engine->ExecuteCommand("-leaderboard");
 			}
 		});
@@ -480,8 +480,8 @@ DETOUR_COMMAND(Client::closeleaderboard) {
 
 	Client::closeleaderboard_callback(args);
 
-	if (g_leaderboardOpen) {
-		g_leaderboardOpen = false;
+	if (client->g_leaderboardOpen) {
+		client->g_leaderboardOpen = false;
 		NetMessage::SendMsg(LEADERBOARD_MESSAGE_TYPE, 0, 0);
 	}
 }

src/Modules/Client.hpp

@@ -72,6 +72,9 @@ class Client : public Module {
 	int *nNumSPChapters;
 	int *nNumMPChapters;
 
+	bool g_leaderboardOpen;
+	bool g_leaderboardWillClose;
+
 	std::string lastLevelName;
 	void **gamerules;