diff options
| author | Jan <sentrycraft123@gmail.com> | 2023-06-29 04:22:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 23:22:33 -0400 |
| commit | efd907105cf7906c78253631f75bf4fd83f769db (patch) | |
| tree | 0516853204106852adb06ee1d69a74e8994309a0 /NorthstarDLL/core/filesystem | |
| parent | b5c4e4e7ed81394070b05296ed087b6043d27667 (diff) | |
| download | NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.tar.gz NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.zip | |
Code cleanup (#478)v1.16.0-rc1v1.15.1-rc1v1.15.11.15.X
* turn implicit type casts into standard compliant explicit type casts
* correct includes and library names
* correct implicit use of std-namespaced functions
* turn incomplete virtual implementations into pure virtuals (this also follows what the Source SDK tier0 header does)
* define SqRecurseArgs ahead of implementation to fix templating problems
* switch out removed getentity with getthisentity
* fix calls to curl_easy_escape with wrong types
* replace winapi-specific function with std starts_with function
* format squirrel header
Diffstat (limited to 'NorthstarDLL/core/filesystem')
| -rw-r--r-- | NorthstarDLL/core/filesystem/filesystem.cpp | 6 | ||||
| -rw-r--r-- | NorthstarDLL/core/filesystem/rpakfilesystem.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/NorthstarDLL/core/filesystem/filesystem.cpp b/NorthstarDLL/core/filesystem/filesystem.cpp index 88622e5d..d9c70476 100644 --- a/NorthstarDLL/core/filesystem/filesystem.cpp +++ b/NorthstarDLL/core/filesystem/filesystem.cpp @@ -179,7 +179,7 @@ ON_DLL_LOAD("filesystem_stdio.dll", Filesystem, (CModule module)) R2::g_pFilesystem = new SourceInterface<IFileSystem>("filesystem_stdio.dll", "VFileSystem017"); - AddSearchPathHook.Dispatch((*g_pFilesystem)->m_vtable->AddSearchPath); - ReadFromCacheHook.Dispatch((*g_pFilesystem)->m_vtable->ReadFromCache); - MountVPKHook.Dispatch((*g_pFilesystem)->m_vtable->MountVPK); + AddSearchPathHook.Dispatch((LPVOID)(*g_pFilesystem)->m_vtable->AddSearchPath); + ReadFromCacheHook.Dispatch((LPVOID)(*g_pFilesystem)->m_vtable->ReadFromCache); + MountVPKHook.Dispatch((LPVOID)(*g_pFilesystem)->m_vtable->MountVPK); } diff --git a/NorthstarDLL/core/filesystem/rpakfilesystem.cpp b/NorthstarDLL/core/filesystem/rpakfilesystem.cpp index c863463c..e42d6826 100644 --- a/NorthstarDLL/core/filesystem/rpakfilesystem.cpp +++ b/NorthstarDLL/core/filesystem/rpakfilesystem.cpp @@ -341,7 +341,7 @@ ON_DLL_LOAD("engine.dll", RpakFilesystem, (CModule module)) g_pakLoadApi = module.Offset(0x5BED78).Deref().As<PakLoadFuncs*>(); pUnknownPakLoadSingleton = module.Offset(0x7C5E20).As<void**>(); - LoadPakAsyncHook.Dispatch(g_pakLoadApi->LoadPakAsync); - UnloadPakHook.Dispatch(g_pakLoadApi->UnloadPak); - ReadFileAsyncHook.Dispatch(g_pakLoadApi->ReadFileAsync); + LoadPakAsyncHook.Dispatch((LPVOID*)g_pakLoadApi->LoadPakAsync); + UnloadPakHook.Dispatch((LPVOID*)g_pakLoadApi->UnloadPak); + ReadFileAsyncHook.Dispatch((LPVOID*)g_pakLoadApi->ReadFileAsync); } |