Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Features/AutoSubmit.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "AutoSubmit.hpp"

#include "../Games/Portal2.hpp"
#include "../Modules/Client.hpp"
#include "Cheats.hpp"
#include "Command.hpp"
#include "Event.hpp"
Expand Down Expand Up @@ -29,6 +30,7 @@
#define OLD_API_KEY_FILE "autosubmit_key.txt"

bool AutoSubmit::g_cheated = false;
int AutoSubmit::g_paused = 0;
std::string AutoSubmit::g_partner_name = "";

ON_EVENT(SESSION_START) {
Expand All @@ -47,10 +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() && !client->g_leaderboardOpen) AutoSubmit::g_paused++;
}

static std::string g_api_base;
Expand Down Expand Up @@ -581,6 +585,13 @@ void AutoSubmit::FinishRun(float final_time, const char *demopath, std::optional
return;
}

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;
Expand Down
1 change: 1 addition & 0 deletions src/Features/AutoSubmit.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

namespace AutoSubmit {
extern bool g_cheated;
extern int g_paused;
extern std::string g_partner_name;

void LoadApiKey(bool output_nonexist);
Expand Down
14 changes: 6 additions & 8 deletions src/Modules/Client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,18 +350,16 @@ DETOUR_T(const char *, Client::GetName) {
return Client::GetName(thisptr);
}

static bool g_leaderboardOpen = false;
static 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");
}
});
Expand Down Expand Up @@ -466,7 +464,7 @@ ON_INIT {
NetMessage::RegisterHandler(LEADERBOARD_MESSAGE_TYPE, +[](const void *data, size_t size) {
// TODO: Investigate why this sometimes doesn't work - AMJ 2024-04-25
if (sar_disable_challenge_stats_hud_partner.GetBool()) {
g_leaderboardWillClose = true;
client->g_leaderboardWillClose = true;
engine->ExecuteCommand("-leaderboard");
} });
}
Expand All @@ -480,8 +478,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);
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/Modules/Client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ class Client : public Module {
int *nNumSPChapters;
int *nNumMPChapters;

bool g_leaderboardOpen = false;
bool g_leaderboardWillClose = false;

std::string lastLevelName;
void **gamerules;

Expand Down