diff options
| author | Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> | 2023-12-20 13:24:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 14:24:07 +0100 |
| commit | 0438b5c8cfa99ac01c7e142d959aa40f88f1cc70 (patch) | |
| tree | bbfdded20f8686cf188dba148db4b6c1b1211872 /NorthstarDLL/mods/modmanager.cpp | |
| parent | 210dab2b0e5c686829bafdc857d2910f6b216b85 (diff) | |
| download | NorthstarLauncher-0438b5c8cfa99ac01c7e142d959aa40f88f1cc70.tar.gz NorthstarLauncher-0438b5c8cfa99ac01c7e142d959aa40f88f1cc70.zip | |
Cherry pick "remove unnecessary namespaces" from primedev (#618)v1.21.2-rc2
Cherry-picks the removal of unnecessary namespaces from `primedev`
https://github.com/F1F7Y/NorthstarPrime/
Co-authored-by: F1F7Y <filip.bartos07@proton.me>
Diffstat (limited to 'NorthstarDLL/mods/modmanager.cpp')
| -rw-r--r-- | NorthstarDLL/mods/modmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NorthstarDLL/mods/modmanager.cpp b/NorthstarDLL/mods/modmanager.cpp index 982f5068..8a0eb71d 100644 --- a/NorthstarDLL/mods/modmanager.cpp +++ b/NorthstarDLL/mods/modmanager.cpp @@ -760,7 +760,7 @@ void ModManager::LoadMods() { // make sure convar isn't registered yet, unsure if necessary but idk what // behaviour is for defining same convar multiple times - if (!R2::g_pCVar->FindVar(convar->Name.c_str())) + if (!g_pCVar->FindVar(convar->Name.c_str())) { new ConVar(convar->Name.c_str(), convar->DefaultValue.c_str(), convar->Flags, convar->HelpString.c_str()); } @@ -769,7 +769,7 @@ void ModManager::LoadMods() for (ModConCommand* command : mod.ConCommands) { // make sure command isnt't registered multiple times. - if (!R2::g_pCVar->FindCommand(command->Name.c_str())) + if (!g_pCVar->FindCommand(command->Name.c_str())) { ConCommand* newCommand = new ConCommand(); std::string funcName = command->Function; @@ -818,7 +818,7 @@ void ModManager::LoadMods() modVpk.m_sVpkPath = (file.path().parent_path() / vpkName).string(); if (m_bHasLoadedMods && modVpk.m_bAutoLoad) - (*R2::g_pFilesystem)->m_vtable->MountVPK(*R2::g_pFilesystem, vpkName.c_str()); + (*g_pFilesystem)->m_vtable->MountVPK(*g_pFilesystem, vpkName.c_str()); } } } |