move the tas setting defaults below the specialstring setter stuff

shavitush · Jan 15, 2022 · c8c8734 · c8c8734
1 parent d1b2ffd
commit c8c8734
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/addons/sourcemod/scripting/include/shavit/style-settings.sp b/addons/sourcemod/scripting/include/shavit/style-settings.sp
@@ -257,36 +257,6 @@ public SMCResult OnStyleLeaveSection(SMCParser smc)
 	}
 #endif
 
-	if (GetStyleSettingBool(gI_CurrentParserIndex, "tas"))
-	{
-		bool x;
-
-		if (!gSM_StyleKeysSet.GetValue("tas_timescale", x))
-		{
-			SetStyleSettingFloat(gI_CurrentParserIndex, "tas_timescale", -1.0);
-		}
-
-		if (!gSM_StyleKeysSet.GetValue("autostrafe", x))
-		{
-			SetStyleSettingInt  (gI_CurrentParserIndex, "autostrafe", 1);
-		}
-
-		if (!gSM_StyleKeysSet.GetValue("autoprestrafe", x))
-		{
-			SetStyleSettingBool (gI_CurrentParserIndex, "autoprestrafe", true);
-		}
-
-		if (!gSM_StyleKeysSet.GetValue("edgejump", x))
-		{
-			SetStyleSettingBool (gI_CurrentParserIndex, "edgejump", true);
-		}
-
-		if (!gSM_StyleKeysSet.GetValue("autojumponstart", x))
-		{
-			SetStyleSettingBool (gI_CurrentParserIndex, "autojumponstart", true);
-		}
-	}
-
 	if (GetStyleSettingInt(gI_CurrentParserIndex, "prespeed") > 0 || GetStyleSettingInt(gI_CurrentParserIndex, "prespeed_type") > 0)
 	{
 		bool value;
@@ -407,6 +377,36 @@ public SMCResult OnStyleLeaveSection(SMCParser smc)
 		}
 	}
 
+	if (GetStyleSettingBool(gI_CurrentParserIndex, "tas"))
+	{
+		bool x;
+
+		if (!gSM_StyleKeysSet.GetValue("tas_timescale", x))
+		{
+			SetStyleSettingFloat(gI_CurrentParserIndex, "tas_timescale", -1.0);
+		}
+
+		if (!gSM_StyleKeysSet.GetValue("autostrafe", x))
+		{
+			SetStyleSettingInt  (gI_CurrentParserIndex, "autostrafe", 1);
+		}
+
+		if (!gSM_StyleKeysSet.GetValue("autoprestrafe", x))
+		{
+			SetStyleSettingBool (gI_CurrentParserIndex, "autoprestrafe", true);
+		}
+
+		if (!gSM_StyleKeysSet.GetValue("edgejump", x))
+		{
+			SetStyleSettingBool (gI_CurrentParserIndex, "edgejump", true);
+		}
+
+		if (!gSM_StyleKeysSet.GetValue("autojumponstart", x))
+		{
+			SetStyleSettingBool (gI_CurrentParserIndex, "autojumponstart", true);
+		}
+	}
+
 	delete gSM_StyleKeysSet;
 	gI_CurrentParserIndex = -1;
 	return SMCParse_Continue;