fix: correct error handling in some tas tools

Author: Krzyhau

src/Features/Tas/TasTools/AutoAimTool.cpp

@@ -22,23 +22,27 @@ std::shared_ptr<TasToolParams> AutoAimTool::ParseParams(std::vector<std::string>
 		throw TasParserArgumentCountException(this, args.size());
 	}
 
-	int ticks;
-	AngleToolsUtils::EasingType easingType;
+	int ticks = 1;
+	AngleToolsUtils::EasingType easingType = AngleToolsUtils::EasingType::Linear;
 
 	// ticks
 	unsigned ticksPos = usesEntitySelector ? 2 : 3;
-	try {
-		ticks = args.size() >= ticksPos + 1 ? std::stoi(args[ticksPos]) : 1;
-	} catch (...) {
-		throw TasParserArgumentException(this, "ticks", args[ticksPos]);
+	if (args.size() >= ticksPos + 1) {
+		try {
+			ticks = std::stoi(args[ticksPos]);
+		} catch (...) {
+			throw TasParserArgumentException(this, "ticks", args[ticksPos]);
+		}
 	}
 
 	// easing type
 	unsigned typePos = usesEntitySelector ? 3 : 4;
-	try {
-		easingType = AngleToolsUtils::ParseEasingType(args.size() >= typePos + 1 ? args[typePos] : "linear");
-	} catch (...) {
-		throw TasParserArgumentException(this, "interpolation", args[typePos]);
+	if (args.size() >= typePos + 1) {
+		try {
+			easingType = AngleToolsUtils::ParseEasingType(args[typePos]);
+		} catch (...) {
+			throw TasParserArgumentException(this, "interpolation", args[typePos]);
+		}
 	}
 
 	if (usesEntitySelector) {

src/Features/Tas/TasTools/DuckTool.cpp

@@ -29,7 +29,7 @@ void DuckTool::Apply(TasFramebulk &bulk, const TasPlayerInfo &pInfo) {
 
 std::shared_ptr<TasToolParams> DuckTool::ParseParams(std::vector<std::string> vp) {
 	if (vp.size() != 1)
-		TasParserArgumentCountException(this, vp.size());
+		throw TasParserArgumentCountException(this, vp.size());
 
 	bool enabled = true;
 	int time = INT32_MAX;

src/Features/Tas/TasTools/LookTool.cpp

@@ -32,7 +32,7 @@ void LookTool::Apply(TasFramebulk &fb, const TasPlayerInfo &playerInfo) {
 std::shared_ptr<TasToolParams> LookTool::ParseParams(std::vector<std::string> vp) {
 
 	if (vp.size() == 0) {
-		throw TasParserException(Utils::ssprintf("Wrong argument count for tool %s: %d", this->GetName(), vp.size()));
+		throw TasParserArgumentCountException(this, vp.size());
 	}
 
 	float pitchDelta = 0.0f;

src/Features/Tas/TasTools/SetAngleTool.cpp

@@ -51,8 +51,8 @@ std::shared_ptr<TasToolParams> SetAngleTool::ParseParams(std::vector<std::string
 	std::string target;
 	float pitch;
 	float yaw;
-	int ticks;
-	AngleToolsUtils::EasingType easingType;
+	int ticks = 1;
+	AngleToolsUtils::EasingType easingType = AngleToolsUtils::EasingType::Linear;
 	int i = 2;
 
 	if (vp[0] == "off") {
@@ -83,18 +83,23 @@ std::shared_ptr<TasToolParams> SetAngleTool::ParseParams(std::vector<std::string
 	}
 
 	// ticks
-	try {
-		ticks = vp.size() >= (size_t)(i + 1) ? std::stoi(vp[i]) : 1;
-	} catch (...) {
-		throw TasParserArgumentException(this, "tick", vp[i]);
+	if (vp.size() >= i + 1) {
+		try {
+			ticks = std::stoi(vp[i]);
+		} catch (...) {
+			throw TasParserArgumentException(this, "tick", vp[i]);
+		}
 	}
 
 	// easing type
-	try {
-		easingType = AngleToolsUtils::ParseEasingType(vp.size() >= (size_t)(i + 2) ? vp[i + 1] : "linear");
-	} catch (...) {
-		throw TasParserArgumentException(this, "interpolation", vp[i + 1]);
+	if (vp.size() >= i + 2) {
+		try {
+			easingType = AngleToolsUtils::ParseEasingType(vp[i + 1]);
+		} catch (...) {
+			throw TasParserArgumentException(this, "interpolation", vp[i + 1]);
+		}
 	}
+	
 
 	return std::make_shared<SetAngleParams>(target, pitch, yaw, ticks, easingType);
 }