From 93d540dd37298b9e9a6c1f07b5c4a8dc46a2787d Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Sat, 21 May 2022 20:59:57 +0100 Subject: remove unnecessary header files --- .../NorthstarDedicatedTest.vcxproj | 22 ------- .../NorthstarDedicatedTest.vcxproj.filters | 69 ---------------------- NorthstarDedicatedTest/audio.cpp | 6 +- NorthstarDedicatedTest/buildainfile.cpp | 1 - NorthstarDedicatedTest/buildainfile.h | 1 - NorthstarDedicatedTest/chatcommand.cpp | 1 - NorthstarDedicatedTest/chatcommand.h | 1 - NorthstarDedicatedTest/clientauthhooks.cpp | 1 - NorthstarDedicatedTest/clientauthhooks.h | 1 - NorthstarDedicatedTest/clientchathooks.cpp | 1 - NorthstarDedicatedTest/clientchathooks.h | 1 - NorthstarDedicatedTest/clientruihooks.cpp | 1 - NorthstarDedicatedTest/clientruihooks.h | 1 - NorthstarDedicatedTest/clientvideooverrides.cpp | 1 - NorthstarDedicatedTest/clientvideooverrides.h | 1 - NorthstarDedicatedTest/debugoverlay.cpp | 1 - NorthstarDedicatedTest/debugoverlay.h | 1 - NorthstarDedicatedTest/dedicated.cpp | 2 +- NorthstarDedicatedTest/dedicated.h | 2 +- NorthstarDedicatedTest/dedicatedmaterialsystem.cpp | 1 - NorthstarDedicatedTest/dedicatedmaterialsystem.h | 1 - NorthstarDedicatedTest/demofixes.cpp | 1 - NorthstarDedicatedTest/demofixes.h | 1 - NorthstarDedicatedTest/dllmain.cpp | 4 -- NorthstarDedicatedTest/hooks.cpp | 4 +- NorthstarDedicatedTest/host.cpp | 1 - NorthstarDedicatedTest/host.h | 1 - NorthstarDedicatedTest/keyvalues.cpp | 1 - NorthstarDedicatedTest/keyvalues.h | 1 - NorthstarDedicatedTest/languagehooks.cpp | 1 - NorthstarDedicatedTest/languagehooks.h | 1 - NorthstarDedicatedTest/latencyflex.cpp | 1 - NorthstarDedicatedTest/latencyflex.h | 1 - NorthstarDedicatedTest/logging.cpp | 2 +- NorthstarDedicatedTest/mapsprint.cpp | 4 +- NorthstarDedicatedTest/maxplayers.cpp | 1 - NorthstarDedicatedTest/maxplayers.h | 1 - NorthstarDedicatedTest/miscclientfixes.cpp | 1 - NorthstarDedicatedTest/miscclientfixes.h | 1 - NorthstarDedicatedTest/miscserverfixes.cpp | 1 - NorthstarDedicatedTest/miscserverfixes.h | 1 - NorthstarDedicatedTest/modlocalisation.cpp | 1 - NorthstarDedicatedTest/modlocalisation.h | 1 - NorthstarDedicatedTest/rpakfilesystem.cpp | 2 +- NorthstarDedicatedTest/scriptbrowserhooks.cpp | 1 - NorthstarDedicatedTest/scriptbrowserhooks.h | 1 - NorthstarDedicatedTest/scriptmainmenupromos.cpp | 1 - NorthstarDedicatedTest/scriptmainmenupromos.h | 1 - NorthstarDedicatedTest/scriptmodmenu.cpp | 1 - NorthstarDedicatedTest/scriptmodmenu.h | 1 - NorthstarDedicatedTest/scriptserverbrowser.cpp | 1 - NorthstarDedicatedTest/scriptserverbrowser.h | 1 - .../scriptservertoclientstringcommand.cpp | 1 - .../scriptservertoclientstringcommand.h | 1 - NorthstarDedicatedTest/serverauthentication.cpp | 2 +- 55 files changed, 12 insertions(+), 151 deletions(-) delete mode 100644 NorthstarDedicatedTest/buildainfile.h delete mode 100644 NorthstarDedicatedTest/chatcommand.h delete mode 100644 NorthstarDedicatedTest/clientauthhooks.h delete mode 100644 NorthstarDedicatedTest/clientchathooks.h delete mode 100644 NorthstarDedicatedTest/clientruihooks.h delete mode 100644 NorthstarDedicatedTest/clientvideooverrides.h delete mode 100644 NorthstarDedicatedTest/debugoverlay.h delete mode 100644 NorthstarDedicatedTest/dedicatedmaterialsystem.h delete mode 100644 NorthstarDedicatedTest/demofixes.h delete mode 100644 NorthstarDedicatedTest/host.h delete mode 100644 NorthstarDedicatedTest/keyvalues.h delete mode 100644 NorthstarDedicatedTest/languagehooks.h delete mode 100644 NorthstarDedicatedTest/latencyflex.h delete mode 100644 NorthstarDedicatedTest/maxplayers.h delete mode 100644 NorthstarDedicatedTest/miscclientfixes.h delete mode 100644 NorthstarDedicatedTest/miscserverfixes.h delete mode 100644 NorthstarDedicatedTest/modlocalisation.h delete mode 100644 NorthstarDedicatedTest/scriptbrowserhooks.h delete mode 100644 NorthstarDedicatedTest/scriptmainmenupromos.h delete mode 100644 NorthstarDedicatedTest/scriptmodmenu.h delete mode 100644 NorthstarDedicatedTest/scriptserverbrowser.h delete mode 100644 NorthstarDedicatedTest/scriptservertoclientstringcommand.h (limited to 'NorthstarDedicatedTest') diff --git a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj index d20cb69e..0c012880 100644 --- a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj +++ b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj @@ -117,15 +117,7 @@ - - - - - - - - @@ -136,14 +128,12 @@ - - @@ -544,31 +534,19 @@ - - - - - - - - - - - - diff --git a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters index d3796ff5..c31b5045 100644 --- a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters +++ b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters @@ -130,9 +130,6 @@ {14fc0931-acad-46ec-a55e-94f4469d4235} - - {9ce4bfce-f214-4bc1-9dc7-f3219900718a} - {51910ba0-2ff8-461d-9f67-8d7907b57d22} @@ -576,36 +573,21 @@ Header Files\Server\Authentication - - Header Files\Shared\Mods\Compiled - Header Files\include Header Files\Shared - - Header Files\Client - - - Header Files\Client - Header Files\Shared\Convar Header Files\Shared\Mods\Compiled - - Header Files\Client - Header Files\Shared - - Header Files\Client - Header Files\include\openssl\openssl @@ -1386,12 +1368,6 @@ Header Files\include\openssl\internal - - Header Files\Server - - - Header Files\Shared - Header Files\include\libcurl @@ -1428,18 +1404,9 @@ Header Files\Server\Authentication - - Header Files\Client - - - Header Files\Client - Header Files\Client - - Header Files\Server - Header Files\Shared @@ -1467,12 +1434,6 @@ Header Files - - Header Files\Client - - - Header Files\Client - Source Files\Shared\Exploit Fixes @@ -1485,9 +1446,6 @@ Header Files - - Header Files\Client - Header Files @@ -1497,27 +1455,6 @@ Header Files\Shared\Game Functions - - Header Files\Client\Scripted - - - Header Files\Client\Scripted - - - Header Files\Client\Scripted - - - Header Files\Client\Scripted - - - Header Files\Client\Scripted - - - Header Files\Client\Scripted - - - Header Files\Shared - Header Files\Shared @@ -1530,18 +1467,12 @@ Header Files\Server\Dedicated - - Header Files\Server\Dedicated - Header Files\Shared\Console Header Files\Shared\Console - - Header Files\Client - Header Files\Shared\Game Functions diff --git a/NorthstarDedicatedTest/audio.cpp b/NorthstarDedicatedTest/audio.cpp index f9db1ee6..eb493779 100644 --- a/NorthstarDedicatedTest/audio.cpp +++ b/NorthstarDedicatedTest/audio.cpp @@ -264,7 +264,7 @@ EventOverrideData::EventOverrideData(const std::string& data, const fs::path& pa bool CustomAudioManager::TryLoadAudioOverride(const fs::path& defPath) { - if (IsDedicated()) + if (IsDedicatedServer()) return true; // silently fail std::ifstream jsonStream(defPath); @@ -307,7 +307,7 @@ MilesStopAll_Type MilesStopAll; void CustomAudioManager::ClearAudioOverrides() { - if (IsDedicated()) + if (IsDedicatedServer()) return; if (m_loadedAudioOverrides.size() > 0 || m_loadedAudioOverridesRegex.size() > 0) @@ -496,7 +496,7 @@ ON_DLL_LOAD_CLIENT_RELIESON("client.dll", AudioHooks, ConVar, [](HMODULE baseAdd { Cvar_ns_print_played_sounds = new ConVar("ns_print_played_sounds", "0", FCVAR_NONE, ""); - if (IsDedicated()) + if (IsDedicatedServer()) return; uintptr_t milesAudioBase = (uintptr_t)GetModuleHandleA("mileswin64.dll"); diff --git a/NorthstarDedicatedTest/buildainfile.cpp b/NorthstarDedicatedTest/buildainfile.cpp index 30df6f91..39ce0323 100644 --- a/NorthstarDedicatedTest/buildainfile.cpp +++ b/NorthstarDedicatedTest/buildainfile.cpp @@ -1,5 +1,4 @@ #include "pch.h" -#include "buildainfile.h" #include "convar.h" #include "hooks.h" #include "hookutils.h" diff --git a/NorthstarDedicatedTest/buildainfile.h b/NorthstarDedicatedTest/buildainfile.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/buildainfile.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/chatcommand.cpp b/NorthstarDedicatedTest/chatcommand.cpp index ba096d69..78f4477d 100644 --- a/NorthstarDedicatedTest/chatcommand.cpp +++ b/NorthstarDedicatedTest/chatcommand.cpp @@ -2,7 +2,6 @@ #include "hooks.h" #include "convar.h" #include "concommand.h" -#include "chatcommand.h" #include "localchatwriter.h" // note: isIngameChat is an int64 because the whole register the arg is stored in needs to be 0'd out to work diff --git a/NorthstarDedicatedTest/chatcommand.h b/NorthstarDedicatedTest/chatcommand.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/chatcommand.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/clientauthhooks.cpp b/NorthstarDedicatedTest/clientauthhooks.cpp index b2dc8ce5..6e1da395 100644 --- a/NorthstarDedicatedTest/clientauthhooks.cpp +++ b/NorthstarDedicatedTest/clientauthhooks.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "clientauthhooks.h" #include "hookutils.h" #include "masterserver.h" #include "convar.h" diff --git a/NorthstarDedicatedTest/clientauthhooks.h b/NorthstarDedicatedTest/clientauthhooks.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/clientauthhooks.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/clientchathooks.cpp b/NorthstarDedicatedTest/clientchathooks.cpp index 80d8a295..a5daa2be 100644 --- a/NorthstarDedicatedTest/clientchathooks.cpp +++ b/NorthstarDedicatedTest/clientchathooks.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "clientchathooks.h" #include #include "squirrel.h" #include "serverchathooks.h" diff --git a/NorthstarDedicatedTest/clientchathooks.h b/NorthstarDedicatedTest/clientchathooks.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/clientchathooks.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/clientruihooks.cpp b/NorthstarDedicatedTest/clientruihooks.cpp index 0f48ced7..65c85511 100644 --- a/NorthstarDedicatedTest/clientruihooks.cpp +++ b/NorthstarDedicatedTest/clientruihooks.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "clientruihooks.h" #include "convar.h" ConVar* Cvar_rui_drawEnable; diff --git a/NorthstarDedicatedTest/clientruihooks.h b/NorthstarDedicatedTest/clientruihooks.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/clientruihooks.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/clientvideooverrides.cpp b/NorthstarDedicatedTest/clientvideooverrides.cpp index 498d48ed..8bed49e9 100644 --- a/NorthstarDedicatedTest/clientvideooverrides.cpp +++ b/NorthstarDedicatedTest/clientvideooverrides.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "clientvideooverrides.h" #include "modmanager.h" typedef void* (*BinkOpenType)(const char* path, uint32_t flags); diff --git a/NorthstarDedicatedTest/clientvideooverrides.h b/NorthstarDedicatedTest/clientvideooverrides.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/clientvideooverrides.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/debugoverlay.cpp b/NorthstarDedicatedTest/debugoverlay.cpp index 051f34e6..64e0d065 100644 --- a/NorthstarDedicatedTest/debugoverlay.cpp +++ b/NorthstarDedicatedTest/debugoverlay.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "debugoverlay.h" #include "dedicated.h" #include "cvar.h" diff --git a/NorthstarDedicatedTest/debugoverlay.h b/NorthstarDedicatedTest/debugoverlay.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/debugoverlay.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/dedicated.cpp b/NorthstarDedicatedTest/dedicated.cpp index 6f7a4a73..5d8fedf0 100644 --- a/NorthstarDedicatedTest/dedicated.cpp +++ b/NorthstarDedicatedTest/dedicated.cpp @@ -13,7 +13,7 @@ using namespace Tier0; using namespace R2; -bool IsDedicated() +bool IsDedicatedServer() { static bool result = strstr(GetCommandLineA(), "-dedicated"); return result; diff --git a/NorthstarDedicatedTest/dedicated.h b/NorthstarDedicatedTest/dedicated.h index bbca3c83..82806763 100644 --- a/NorthstarDedicatedTest/dedicated.h +++ b/NorthstarDedicatedTest/dedicated.h @@ -1,3 +1,3 @@ #pragma once -bool IsDedicated(); +bool IsDedicatedServer(); diff --git a/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp b/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp index 2e5c1321..7142e44d 100644 --- a/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp +++ b/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp @@ -2,7 +2,6 @@ #include "pch.h" #include "hooks.h" #include "dedicated.h" -#include "dedicatedmaterialsystem.h" #include "hookutils.h" #include "tier0.h" #include "NSMem.h" diff --git a/NorthstarDedicatedTest/dedicatedmaterialsystem.h b/NorthstarDedicatedTest/dedicatedmaterialsystem.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/dedicatedmaterialsystem.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/demofixes.cpp b/NorthstarDedicatedTest/demofixes.cpp index 0cfb35f4..c2eb9b09 100644 --- a/NorthstarDedicatedTest/demofixes.cpp +++ b/NorthstarDedicatedTest/demofixes.cpp @@ -1,5 +1,4 @@ #include "pch.h" -#include "demofixes.h" #include "convar.h" #include "NSMem.h" diff --git a/NorthstarDedicatedTest/demofixes.h b/NorthstarDedicatedTest/demofixes.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/demofixes.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp index 4c81c49d..f097aa20 100644 --- a/NorthstarDedicatedTest/dllmain.cpp +++ b/NorthstarDedicatedTest/dllmain.cpp @@ -2,11 +2,7 @@ #include "hooks.h" #include "main.h" #include "logging.h" -#include "keyvalues.h" -#include "masterserver.h" -#include "tier0.h" #include "memalloc.h" -#include "maxplayers.h" #include "configurables.h" #include "plugin_abi.h" #include "plugins.h" diff --git a/NorthstarDedicatedTest/hooks.cpp b/NorthstarDedicatedTest/hooks.cpp index 82485e0e..32e4530c 100644 --- a/NorthstarDedicatedTest/hooks.cpp +++ b/NorthstarDedicatedTest/hooks.cpp @@ -139,7 +139,7 @@ void AddDllLoadCallback(std::string dll, DllLoadCallbackFuncType callback, std:: void AddDllLoadCallbackForDedicatedServer( std::string dll, DllLoadCallbackFuncType callback, std::string tag, std::string reliesOn) { - if (!IsDedicated()) + if (!IsDedicatedServer()) return; AddDllLoadCallback(dll, callback, tag, reliesOn); @@ -147,7 +147,7 @@ void AddDllLoadCallbackForDedicatedServer( void AddDllLoadCallbackForClient(std::string dll, DllLoadCallbackFuncType callback, std::string tag, std::string reliesOn) { - if (IsDedicated()) + if (IsDedicatedServer()) return; AddDllLoadCallback(dll, callback, tag, reliesOn); diff --git a/NorthstarDedicatedTest/host.cpp b/NorthstarDedicatedTest/host.cpp index a67e0ede..d3a78877 100644 --- a/NorthstarDedicatedTest/host.cpp +++ b/NorthstarDedicatedTest/host.cpp @@ -1,5 +1,4 @@ #include "pch.h" -#include "host.h" #include "convar.h" #include "modmanager.h" #include "commandprint.h" diff --git a/NorthstarDedicatedTest/host.h b/NorthstarDedicatedTest/host.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/host.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/keyvalues.cpp b/NorthstarDedicatedTest/keyvalues.cpp index 11fc1486..86cda483 100644 --- a/NorthstarDedicatedTest/keyvalues.cpp +++ b/NorthstarDedicatedTest/keyvalues.cpp @@ -1,5 +1,4 @@ #include "pch.h" -#include "keyvalues.h" #include "modmanager.h" #include "hooks.h" #include "filesystem.h" diff --git a/NorthstarDedicatedTest/keyvalues.h b/NorthstarDedicatedTest/keyvalues.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/keyvalues.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/languagehooks.cpp b/NorthstarDedicatedTest/languagehooks.cpp index e5063359..42ac9b6a 100644 --- a/NorthstarDedicatedTest/languagehooks.cpp +++ b/NorthstarDedicatedTest/languagehooks.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "languagehooks.h" #include "tier0.h" #include #include diff --git a/NorthstarDedicatedTest/languagehooks.h b/NorthstarDedicatedTest/languagehooks.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/languagehooks.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/latencyflex.cpp b/NorthstarDedicatedTest/latencyflex.cpp index 72fe297b..c5868aa7 100644 --- a/NorthstarDedicatedTest/latencyflex.cpp +++ b/NorthstarDedicatedTest/latencyflex.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "latencyflex.h" #include "hookutils.h" #include "convar.h" diff --git a/NorthstarDedicatedTest/latencyflex.h b/NorthstarDedicatedTest/latencyflex.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/latencyflex.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/logging.cpp b/NorthstarDedicatedTest/logging.cpp index c02e333a..014ef642 100644 --- a/NorthstarDedicatedTest/logging.cpp +++ b/NorthstarDedicatedTest/logging.cpp @@ -205,7 +205,7 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo) else spdlog::error("Failed to write minidump file {}!", stream.str()); - if (!IsDedicated()) + if (!IsDedicatedServer()) MessageBoxA( 0, "Northstar has crashed! Crash info can be found in R2Northstar/logs", "Northstar has crashed!", MB_ICONERROR | MB_OK); } diff --git a/NorthstarDedicatedTest/mapsprint.cpp b/NorthstarDedicatedTest/mapsprint.cpp index ca66487e..bf94c548 100644 --- a/NorthstarDedicatedTest/mapsprint.cpp +++ b/NorthstarDedicatedTest/mapsprint.cpp @@ -106,10 +106,10 @@ void RefreshMapList() } } -typedef int (*_Host_Map_f_CompletionFuncType)( +typedef int (*__fastcall _Host_Map_f_CompletionFuncType)( char const* cmdname, char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]); _Host_Map_f_CompletionFuncType _Host_Map_f_CompletionFunc; -int _Host_Map_f_CompletionFuncHook( +int __fastcall _Host_Map_f_CompletionFuncHook( char const* cmdname, char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]) { // don't update our map list often from this func, only refresh every 10 seconds so we avoid constantly reading fs diff --git a/NorthstarDedicatedTest/maxplayers.cpp b/NorthstarDedicatedTest/maxplayers.cpp index 9e82c014..5fa684d1 100644 --- a/NorthstarDedicatedTest/maxplayers.cpp +++ b/NorthstarDedicatedTest/maxplayers.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "maxplayers.h" #include "tier0.h" // never set this to anything below 32 diff --git a/NorthstarDedicatedTest/maxplayers.h b/NorthstarDedicatedTest/maxplayers.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/maxplayers.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/miscclientfixes.cpp b/NorthstarDedicatedTest/miscclientfixes.cpp index bb59b539..dce6b6c8 100644 --- a/NorthstarDedicatedTest/miscclientfixes.cpp +++ b/NorthstarDedicatedTest/miscclientfixes.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "miscclientfixes.h" #include "convar.h" #include "hookutils.h" #include "NSMem.h" diff --git a/NorthstarDedicatedTest/miscclientfixes.h b/NorthstarDedicatedTest/miscclientfixes.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/miscclientfixes.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/miscserverfixes.cpp b/NorthstarDedicatedTest/miscserverfixes.cpp index 2e646e84..455a3686 100644 --- a/NorthstarDedicatedTest/miscserverfixes.cpp +++ b/NorthstarDedicatedTest/miscserverfixes.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "miscserverfixes.h" #include "hookutils.h" #include "NSMem.h" diff --git a/NorthstarDedicatedTest/miscserverfixes.h b/NorthstarDedicatedTest/miscserverfixes.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/miscserverfixes.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/modlocalisation.cpp b/NorthstarDedicatedTest/modlocalisation.cpp index 7774c4b6..3fd96000 100644 --- a/NorthstarDedicatedTest/modlocalisation.cpp +++ b/NorthstarDedicatedTest/modlocalisation.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "modlocalisation.h" #include "hookutils.h" #include "modmanager.h" diff --git a/NorthstarDedicatedTest/modlocalisation.h b/NorthstarDedicatedTest/modlocalisation.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/modlocalisation.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/rpakfilesystem.cpp b/NorthstarDedicatedTest/rpakfilesystem.cpp index 45367766..4da59836 100644 --- a/NorthstarDedicatedTest/rpakfilesystem.cpp +++ b/NorthstarDedicatedTest/rpakfilesystem.cpp @@ -141,7 +141,7 @@ int LoadPakAsyncHook(char* path, void* unknownSingleton, int flags, void* callba // do this after custom paks load and in bShouldLoadPaks so we only ever call this on the root pakload call // todo: could probably add some way to flag custom paks to not be loaded on dedicated servers in rpak.json - if (IsDedicated() && strncmp(&originalPath[0], "common", 6)) // dedicated only needs common and common_mp + if (IsDedicatedServer() && strncmp(&originalPath[0], "common", 6)) // dedicated only needs common and common_mp { spdlog::info("Not loading pak {} for dedicated server", originalPath); return -1; diff --git a/NorthstarDedicatedTest/scriptbrowserhooks.cpp b/NorthstarDedicatedTest/scriptbrowserhooks.cpp index 138f821f..bb917899 100644 --- a/NorthstarDedicatedTest/scriptbrowserhooks.cpp +++ b/NorthstarDedicatedTest/scriptbrowserhooks.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "scriptbrowserhooks.h" #include "hookutils.h" bool* bIsOriginOverlayEnabled; diff --git a/NorthstarDedicatedTest/scriptbrowserhooks.h b/NorthstarDedicatedTest/scriptbrowserhooks.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/scriptbrowserhooks.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/scriptmainmenupromos.cpp b/NorthstarDedicatedTest/scriptmainmenupromos.cpp index 71afc832..013aa8b3 100644 --- a/NorthstarDedicatedTest/scriptmainmenupromos.cpp +++ b/NorthstarDedicatedTest/scriptmainmenupromos.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "scriptmainmenupromos.h" #include "squirrel.h" #include "masterserver.h" diff --git a/NorthstarDedicatedTest/scriptmainmenupromos.h b/NorthstarDedicatedTest/scriptmainmenupromos.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/scriptmainmenupromos.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/scriptmodmenu.cpp b/NorthstarDedicatedTest/scriptmodmenu.cpp index 9d55e2be..96789068 100644 --- a/NorthstarDedicatedTest/scriptmodmenu.cpp +++ b/NorthstarDedicatedTest/scriptmodmenu.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "scriptmodmenu.h" #include "modmanager.h" #include "squirrel.h" diff --git a/NorthstarDedicatedTest/scriptmodmenu.h b/NorthstarDedicatedTest/scriptmodmenu.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/scriptmodmenu.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/scriptserverbrowser.cpp b/NorthstarDedicatedTest/scriptserverbrowser.cpp index 307af330..5956d0bb 100644 --- a/NorthstarDedicatedTest/scriptserverbrowser.cpp +++ b/NorthstarDedicatedTest/scriptserverbrowser.cpp @@ -1,5 +1,4 @@ #include "pch.h" -#include "scriptserverbrowser.h" #include "squirrel.h" #include "masterserver.h" #include "serverauthentication.h" diff --git a/NorthstarDedicatedTest/scriptserverbrowser.h b/NorthstarDedicatedTest/scriptserverbrowser.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/scriptserverbrowser.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/scriptservertoclientstringcommand.cpp b/NorthstarDedicatedTest/scriptservertoclientstringcommand.cpp index c2c87da1..26660c27 100644 --- a/NorthstarDedicatedTest/scriptservertoclientstringcommand.cpp +++ b/NorthstarDedicatedTest/scriptservertoclientstringcommand.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "hooks.h" -#include "scriptservertoclientstringcommand.h" #include "squirrel.h" #include "convar.h" #include "concommand.h" diff --git a/NorthstarDedicatedTest/scriptservertoclientstringcommand.h b/NorthstarDedicatedTest/scriptservertoclientstringcommand.h deleted file mode 100644 index 6f70f09b..00000000 --- a/NorthstarDedicatedTest/scriptservertoclientstringcommand.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/NorthstarDedicatedTest/serverauthentication.cpp b/NorthstarDedicatedTest/serverauthentication.cpp index 8190050d..a8de1a63 100644 --- a/NorthstarDedicatedTest/serverauthentication.cpp +++ b/NorthstarDedicatedTest/serverauthentication.cpp @@ -463,7 +463,7 @@ char CGameClient__ExecuteStringCommandHook(void* self, uint32_t unknown, const c if (command && !command->IsFlagSet(FCVAR_CLIENTCMD_CAN_EXECUTE)) { // ensure FCVAR_GAMEDLL concommands without FCVAR_CLIENTCMD_CAN_EXECUTE can't be executed by remote clients - if (IsDedicated()) + if (IsDedicatedServer()) return false; if (strcmp((char*)self + 0xF500, R2::g_LocalPlayerUserID)) -- cgit v1.2.3