fix creating replay-directories issue & hopefully first map load replays (#1130)

* fix creating replay-directories issue

* call Shavit_OnStyleConfigLoaded on lateloads

* use the stock for loading the replay folder path

* reorder some replay playback cvar usage

Co-authored-by: rtldg <55846624+rtldg@users.noreply.github.com>

addons/sourcemod/scripting/shavit-replay-playback.sp

@@ -589,11 +589,21 @@ void LoadDHooks()
 // Stops bot_quota from doing anything.
 public MRESReturn Detour_MaintainBotQuota(int pThis)
 {
+	if (!gCV_Enabled.BoolValue)
+	{
+		return MRES_Ignored;
+	}
+
 	return MRES_Supercede;
 }
 
 public MRESReturn Detour_TeamFull(int pThis, DHookReturn hReturn, DHookParam hParams)
 {
+	if (!gCV_Enabled.BoolValue)
+	{
+		return MRES_Ignored;
+	}
+
 	hReturn.Value = false;
 	return MRES_Supercede;
 }
@@ -650,7 +660,7 @@ public Action CommandListener_changelevel(int client, const char[] command, int
 
 public void OnConVarChanged(ConVar convar, const char[] oldValue, const char[] newValue)
 {
-	OnMapStart();
+	KickAllReplays();
 }
 
 public void OnForcedConVarChanged(ConVar convar, const char[] oldValue, const char[] newValue)
@@ -1329,7 +1339,8 @@ public int Native_Replay_DeleteMap(Handle handler, int numParams)
 
 	if(StrEqual(gS_Map, sMap, false))
 	{
-		OnMapStart();
+		KickAllReplays();
+		LoadDefaultReplays(); // clears frame cache
 	}
 
 	return 1;
@@ -1426,6 +1437,11 @@ public int Native_GetReplayFolderPath(Handle handler, int numParams)
 
 public Action Timer_Cron(Handle Timer)
 {
+	if (!gCV_Enabled.BoolValue)
+	{
+		return Plugin_Continue;
+	}
+
 	for (int i = 1; i <= MaxClients; i++)
 	{
 		if (gA_BotInfo[i].iEnt != i)
@@ -1535,11 +1551,6 @@ bool LoadStyling()
 
 public void OnMapStart()
 {
-	if (!LoadStyling())
-	{
-		SetFailState("Could not load the replay bots' configuration file. Make sure it exists (addons/sourcemod/configs/shavit-replay.cfg) and follows the proper syntax!");
-	}
-
 	gB_CanUpdateReplayClient = true;
 
 	GetCurrentMap(gS_Map, sizeof(gS_Map));
@@ -1555,17 +1566,21 @@ public void OnMapStart()
 		ServerCommand("nav_load");
 	}
 
-	KickAllReplays();
-
-	if(!gCV_Enabled.BoolValue)
-	{
-		return;
-	}
-
 	PrecacheModel((gEV_Type == Engine_TF2)? "models/error.mdl":"models/props/cs_office/vending_machine.mdl");
 
-	Shavit_Replay_CreateDirectories(gS_ReplayFolder, gI_Styles);
+	RequestFrame(LoadDefaultReplays);
 
+	if (gH_TeamFull != null && !gB_TeamFullDetoured)
+	{
+		gH_TeamFull.Enable(Hook_Post, Detour_TeamFull);
+		gB_TeamFullDetoured = true;
+	}
+
+	CreateTimer(3.0, Timer_Cron, 0, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
+}
+
+void LoadDefaultReplays()
+{
 	for(int i = 0; i < gI_Styles; i++)
 	{
 		if (!Shavit_ReplayEnabledStyle(i))
@@ -1583,14 +1598,6 @@ public void OnMapStart()
 
 	Call_StartForward(gH_OnReplaysLoaded);
 	Call_Finish();
-
-	if (gH_TeamFull != null)
-	{
-		gH_TeamFull.Enable(Hook_Post, Detour_TeamFull);
-		gB_TeamFullDetoured = true;
-	}
-
-	CreateTimer(3.0, Timer_Cron, 0, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
 }
 
 public void OnMapEnd()
@@ -1606,12 +1613,19 @@ public void OnMapEnd()
 
 public void Shavit_OnStyleConfigLoaded(int styles)
 {
+	if (!LoadStyling())
+	{
+		SetFailState("Could not load the replay bots' configuration file. Make sure it exists (addons/sourcemod/configs/shavit-replay.cfg) and follows the proper syntax!");
+	}
+
 	for (int i = 0; i < styles; i++)
 	{
 		Shavit_GetStyleStringsStruct(i, gS_StyleStrings[i]);
 	}
 
 	gI_Styles = styles;
+
+	Shavit_Replay_CreateDirectories(gS_ReplayFolder, gI_Styles);
 }
 
 public void Shavit_OnChatConfigLoaded()

addons/sourcemod/scripting/shavit-replay-recorder.sp

@@ -151,6 +151,8 @@ public void OnPluginStart()
 
 	if (gB_Late)
 	{
+		Shavit_OnStyleConfigLoaded(Shavit_GetStyleCount());
+
 		for (int i = 1; i <= MaxClients; i++)
 		{
 			if (IsValidClient(i) && !IsFakeClient(i))
@@ -177,44 +179,19 @@ public void OnLibraryRemoved(const char[] name)
 	}
 }
 
-bool LoadReplayConfig()
-{
-	char sPath[PLATFORM_MAX_PATH];
-	BuildPath(Path_SM, sPath, PLATFORM_MAX_PATH, "configs/shavit-replay.cfg");
-
-	KeyValues kv = new KeyValues("shavit-replay");
-
-	if(!kv.ImportFromFile(sPath))
-	{
-		delete kv;
-
-		return false;
-	}
-
-	char sFolder[PLATFORM_MAX_PATH];
-	kv.GetString("replayfolder", sFolder, PLATFORM_MAX_PATH, "{SM}/data/replaybot");
-
-	if(StrContains(sFolder, "{SM}") != -1)
-	{
-		ReplaceString(sFolder, PLATFORM_MAX_PATH, "{SM}/", "");
-		BuildPath(Path_SM, sFolder, PLATFORM_MAX_PATH, "%s", sFolder);
-	}
-
-	strcopy(gS_ReplayFolder, PLATFORM_MAX_PATH, sFolder);
-
-	delete kv;
-
-	return true;
-}
-
 public void OnMapStart()
 {
-	if (!LoadReplayConfig())
+	GetLowercaseMapName(gS_Map);
+}
+
+public void Shavit_OnStyleConfigLoaded(int styles)
+{
+	if (!Shavit_GetReplayFolderPath_Stock(gS_ReplayFolder))
 	{
 		SetFailState("Could not load the replay bots' configuration file. Make sure it exists (addons/sourcemod/configs/shavit-replay.cfg) and follows the proper syntax!");
 	}
 
-	GetLowercaseMapName(gS_Map);
+	gI_Styles = styles;
 
 	Shavit_Replay_CreateDirectories(gS_ReplayFolder, gI_Styles);
 }