commit for merge

3 files changed, 7 insertions, 9 deletions

diff --git a/NorthstarDLL/client/audio.h b/NorthstarDLL/client/audio.h
index 26cda205..915d52ce 100644
--- a/NorthstarDLL/client/audio.h
+++ b/NorthstarDLL/client/audio.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-#include <filesystem>
 #include <regex>
 #include <shared_mutex>
 
diff --git a/NorthstarDLL/client/clientvideooverrides.cpp b/NorthstarDLL/client/clientvideooverrides.cpp
index 1a5924c7..ab78b943 100644
--- a/NorthstarDLL/client/clientvideooverrides.cpp
+++ b/NorthstarDLL/client/clientvideooverrides.cpp
@@ -12,20 +12,20 @@ void*, __fastcall, (const char* path, uint32_t flags))
 	spdlog::info("BinkOpen {}", filename);
 
 	// figure out which mod is handling the bink
-	Mod* fileOwner = nullptr;
-	for (Mod& mod : g_pModManager->m_LoadedMods)
+	Mod* pFileOwner = nullptr;
+	for (Mod& mod : g_pModManager->GetMods())
 	{
 		if (!mod.m_bEnabled)
 			continue;
 
 		if (std::find(mod.BinkVideos.begin(), mod.BinkVideos.end(), filename) != mod.BinkVideos.end())
-			fileOwner = &mod;
+			pFileOwner = &mod;
 	}
 
-	if (fileOwner)
+	if (pFileOwner)
 	{
 		// create new path
-		fs::path binkPath(fileOwner->m_ModDirectory / "media" / filename);
+		fs::path binkPath(pFileOwner->m_ModDirectory / "media" / filename);
 		return BinkOpen(binkPath.string().c_str(), flags);
 	}
 	else
diff --git a/NorthstarDLL/client/modlocalisation.cpp b/NorthstarDLL/client/modlocalisation.cpp
index e5afc793..db138315 100644
--- a/NorthstarDLL/client/modlocalisation.cpp
+++ b/NorthstarDLL/client/modlocalisation.cpp
@@ -26,7 +26,7 @@ void, __fastcall, (void* pVguiLocalize))
 // clang-format on
 {
 	// load all mod localization manually, so we keep track of all files, not just previously loaded ones
-	for (Mod mod : g_pModManager->m_LoadedMods)
+	for (Mod& mod : g_pModManager->GetMods())
 		if (mod.m_bEnabled)
 			for (std::string& localisationFile : mod.LocalisationFiles)
 				CLocalize__AddFile(g_pVguiLocalize, localisationFile.c_str(), nullptr, false);
@@ -44,7 +44,7 @@ void, __fastcall, (void* self))
 
 	// previously we did this in CLocalize::AddFile, but for some reason it won't properly overwrite localization from
 	// files loaded previously if done there, very weird but this works so whatever
-	for (Mod mod : g_pModManager->m_LoadedMods)
+	for (Mod& mod : g_pModManager->GetMods())
 		if (mod.m_bEnabled)
 			for (std::string& localisationFile : mod.LocalisationFiles)
 				CLocalize__AddFile(g_pVguiLocalize, localisationFile.c_str(), nullptr, false);