Deduplicate find_override_file

src/modengine/ext/mod_loader/archive_file_overrides.cpp

@@ -42,8 +42,6 @@ namespace modengine::ext {
 // the easiest and most robust way to do this. It also has the bonus of allowing files that don't go through the asset system
 // (like the data archives and some of the sounds) to be overridable.
 
-namespace fs = std::filesystem;
-
 concurrency::concurrent_unordered_map<std::wstring, std::optional<std::filesystem::path>> archive_override_paths;
 concurrency::concurrent_unordered_map<std::wstring, std::optional<std::filesystem::path>> file_override_paths;
 
@@ -241,4 +239,4 @@ void* __cdecl virtual_to_archive_path_eldenring(DLString<modengine::GameType::SE
     return res;
 }
 
-}
+}

src/modengine/ext/mod_loader/archive_file_overrides.h

@@ -4,10 +4,13 @@
 #include "gametypes/dantelion/dlstring.h"
 
 #include <set>
+#include <filesystem>
 #include <concurrent_vector.h>
 
 namespace modengine::ext {
 
+namespace fs = std::filesystem;
+
 // String type used in DS2/DS3
 typedef struct
 {
@@ -43,4 +46,6 @@ HANDLE WINAPI tCreateFileW(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwSh
     LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
     HANDLE hTemplateFile);
 
-}
+std::optional<fs::path> find_override_file(const fs::path& game_path);
+
+}

src/modengine/ext/mod_loader/wwise_file_overrides.cpp

@@ -41,20 +41,6 @@ namespace fs = std::filesystem;
 
 using namespace spdlog;
 
-std::optional<fs::path> find_override_file(const fs::path game_path)
-{
-    for (const auto& root : hooked_file_roots) {
-        trace(L"Searching for {} in {}", game_path.wstring(), root);
-
-        auto file_path = root / fs::path(game_path);
-        if (fs::exists(file_path)) {
-            return file_path;
-        }
-    }
-
-    return {};
-}
-
 const wchar_t* prefixes[3] = {
     L"sd/",
     L"sd/enus/",