From d9390544047a3e82d7b55d766cd21ae746682e4c Mon Sep 17 00:00:00 2001
From: Jesse <69196954+ThisAMJ@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:49:27 +1000
Subject: [PATCH] fix: un-hardcode max strafe speed

and instead tie to `sv_maxvelocity`.
using the cvar in the constructor won't work, so i changed it to current instead (to remove a nonsensical 10000, constructor value isn't used anyway)
---
 src/Features/Tas/TasTools/StrafeTool.cpp | 7 ++++---
 src/Features/Tas/TasTools/StrafeTool.hpp | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Features/Tas/TasTools/StrafeTool.cpp b/src/Features/Tas/TasTools/StrafeTool.cpp
index 332ccb0f1..b120a5568 100644
--- a/src/Features/Tas/TasTools/StrafeTool.cpp
+++ b/src/Features/Tas/TasTools/StrafeTool.cpp
@@ -442,8 +442,9 @@ void AutoStrafeTool::FollowLine(const TasPlayerInfo &pInfo) {
 
 std::shared_ptr<TasToolParams> AutoStrafeTool::ParseParams(std::vector<std::string> vp) {
 	AutoStrafeType type = VECTORIAL;
-	AutoStrafeDirection dir{CURRENT, false, 0};
-	AutoStrafeSpeed speed = {SPECIFIED, 10000.0f};
+	AutoStrafeDirection dir = {CURRENT, false, 0};
+	float maxSpeed = Variable("sv_maxvelocity").GetFloat() * 1.5f;
+	AutoStrafeSpeed speed = {SPECIFIED, maxSpeed};
 	bool noPitchLock = false;
 	bool antiSpeedLock = true;
 
@@ -466,7 +467,7 @@ std::shared_ptr<TasToolParams> AutoStrafeTool::ParseParams(std::vector<std::stri
 		//speed
 		else if (param == "max") {
 			speed.type = SPECIFIED;
-			speed.speed = 10000.0f;  // as long as it's higher than max speed times square root of 2, we should be fine?
+			speed.speed = maxSpeed;  // as long as it's higher than max speed times square root of 2, we should be fine?
 		} else if (param == "keep") {
 			speed.type = CURRENT;
 		} else if (param.size() > 3 && param.substr(param.size() - 3, 3) == "ups") {
diff --git a/src/Features/Tas/TasTools/StrafeTool.hpp b/src/Features/Tas/TasTools/StrafeTool.hpp
index 16799bb3c..b743e1937 100644
--- a/src/Features/Tas/TasTools/StrafeTool.hpp
+++ b/src/Features/Tas/TasTools/StrafeTool.hpp
@@ -36,7 +36,7 @@ struct AutoStrafeSpeed {
 struct AutoStrafeParams : public TasToolParams {
 	AutoStrafeType strafeType = DISABLED;
 	AutoStrafeDirection strafeDir = {CURRENT, true, 0.0f};
-	AutoStrafeSpeed strafeSpeed = {SPECIFIED, 10000.0f};
+	AutoStrafeSpeed strafeSpeed = {CURRENT};
 	bool noPitchLock = false;
 	bool antiSpeedLock = true;