fix: errors on srm fast load preset

Author: ThisAMJ

src/Cheats.cpp

@@ -102,33 +102,41 @@ CON_COMMAND_COMPLETION(sar_fast_load_preset, "set_fast_load_preset <preset> - se
 
 #define CMD(x) engine->ExecuteCommand(x)
 	if (!strcmp(preset, "none")) {
-		CMD("ui_loadingscreen_transition_time 1.0");
-		CMD("ui_loadingscreen_fadein_time 1.0");
-		CMD("ui_loadingscreen_mintransition_time 0.5");
+		if (!Game::isSpeedrunMod()) {
+			CMD("ui_loadingscreen_transition_time 1.0");
+			CMD("ui_loadingscreen_fadein_time 1.0");
+			CMD("ui_loadingscreen_mintransition_time 0.5");
+		}
 		CMD("sar_disable_progress_bar_update 0");
 		CMD("sar_prevent_mat_snapshot_recompute 0");
 		CMD("sar_loads_uncap 0");
 		CMD("sar_loads_norender 0");
 	} else if (!strcmp(preset, "sla")) {
-		CMD("ui_loadingscreen_transition_time 0.0");
-		CMD("ui_loadingscreen_fadein_time 0.0");
-		CMD("ui_loadingscreen_mintransition_time 0.0");
+		if (!Game::isSpeedrunMod()) {
+			CMD("ui_loadingscreen_transition_time 0.0");
+			CMD("ui_loadingscreen_fadein_time 0.0");
+			CMD("ui_loadingscreen_mintransition_time 0.0");
+		}
 		CMD("sar_disable_progress_bar_update 1");
 		CMD("sar_prevent_mat_snapshot_recompute 1");
 		CMD("sar_loads_uncap 0");
 		CMD("sar_loads_norender 0");
 	} else if (!strcmp(preset, "normal")) {
-		CMD("ui_loadingscreen_transition_time 0.0");
-		CMD("ui_loadingscreen_fadein_time 0.0");
-		CMD("ui_loadingscreen_mintransition_time 0.0");
+		if (!Game::isSpeedrunMod()) {
+			CMD("ui_loadingscreen_transition_time 0.0");
+			CMD("ui_loadingscreen_fadein_time 0.0");
+			CMD("ui_loadingscreen_mintransition_time 0.0");
+		}
 		CMD("sar_disable_progress_bar_update 1");
 		CMD("sar_prevent_mat_snapshot_recompute 1");
 		CMD("sar_loads_uncap 1");
 		CMD("sar_loads_norender 0");
 	} else if (!strcmp(preset, "full")) {
-		CMD("ui_loadingscreen_transition_time 0.0");
-		CMD("ui_loadingscreen_fadein_time 0.0");
-		CMD("ui_loadingscreen_mintransition_time 0.0");
+		if (!Game::isSpeedrunMod()) {
+			CMD("ui_loadingscreen_transition_time 0.0");
+			CMD("ui_loadingscreen_fadein_time 0.0");
+			CMD("ui_loadingscreen_mintransition_time 0.0");
+		}
 		CMD("sar_disable_progress_bar_update 2");
 		CMD("sar_prevent_mat_snapshot_recompute 1");
 		CMD("sar_loads_uncap 1");

src/Features/ConfigPlus.cpp

@@ -347,30 +347,6 @@ static void FreeCondition(Condition *c) {
 	free(c);
 }
 
-static bool isSpeedrunMod() {
-	static bool checked = false;
-	static bool srm = false;
-
-	if (!checked) {
-		auto serverPlugin = (uintptr_t)(engine->s_ServerPlugin->ThisPtr());
-		auto count = *(int *)(serverPlugin + 16); // CServerPlugin::m_Size
-		if (count > 0) {
-			auto plugins = *(uintptr_t *)(serverPlugin + 4); // CServerPlugin::m_Plugins
-			for (int i = 0; i < count; ++i) {
-				auto ptr = *(CPlugin **)(plugins + i * sizeof (uintptr_t));
-				if (!strcmp(ptr->m_szName, "Speedrun Mod was a mistake.")) {
-					srm = true;
-					break;
-				}
-			}
-		}
-
-		checked = true;
-	}
-
-	return srm;
-}
-
 static const char *gameName() {
 	switch (sar.game->GetVersion()) {
 	case SourceGame_ApertureTag:
@@ -382,7 +358,7 @@ static const char *gameName() {
 	case SourceGame_PortalReloaded:
 		return "reloaded";
 	case SourceGame_Portal2:
-		return isSpeedrunMod() ? "srm" : "portal2";
+		return Game::isSpeedrunMod() ? "srm" : "portal2";
 	default:
 		return "other";
 	}

src/Game.cpp

@@ -1,6 +1,7 @@
 #include "Game.hpp"
 
 #include "Command.hpp"
+#include "Modules/Engine.hpp"
 #include "Utils.hpp"
 
 #include <cstring>
@@ -94,3 +95,28 @@ std::string Game::VersionToString(int version) {
 	}
 	return games;
 }
+
+bool Game::isSpeedrunMod() {
+	static bool checked = false;
+	static bool srm = false;
+
+	if (!checked) {
+		auto serverPlugin = (uintptr_t)(engine->s_ServerPlugin->ThisPtr());
+		auto count = *(int *)(serverPlugin + 16); // CServerPlugin::m_Size
+		if (count > 0) {
+			auto plugins = *(uintptr_t *)(serverPlugin + 4); // CServerPlugin::m_Plugins
+			for (int i = 0; i < count; ++i) {
+				auto ptr = *(CPlugin **)(plugins + i * sizeof (uintptr_t));
+				if (!strcmp(ptr->m_szName, "Speedrun Mod was a mistake.")) {
+					srm = true;
+					break;
+				}
+			}
+		}
+
+		checked = true;
+	}
+
+	return srm;
+}
+

src/Game.hpp

@@ -32,4 +32,6 @@ class Game {
 
 	static std::string VersionToString(int version);
 	static std::vector<std::string> mapNames;
+
+	static bool isSpeedrunMod();
 };