diff --git a/Tadah.DLL/Discord.cpp b/Tadah.DLL/Discord.cpp index cb87cad..4af7fa6 100644 --- a/Tadah.DLL/Discord.cpp +++ b/Tadah.DLL/Discord.cpp @@ -2,7 +2,7 @@ #include "Discord.h" -#ifndef ARBITER +#ifndef SERVER std::string username; int placeId; diff --git a/Tadah.DLL/Hooks/CRoblox.cpp b/Tadah.DLL/Hooks/CRoblox.cpp index 42bdf30..0921930 100644 --- a/Tadah.DLL/Hooks/CRoblox.cpp +++ b/Tadah.DLL/Hooks/CRoblox.cpp @@ -27,7 +27,7 @@ BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this) CApp__RobloxAuthenticate(app, nullptr, authenticationUrl.c_str(), authenticationTicket.c_str()); } -#ifndef ARBITER +#ifndef SERVER if (hasJoinArg && !joinScriptUrl.empty()) { try @@ -47,7 +47,7 @@ BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this) void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast) { -#ifndef ARBITER +#ifndef SERVER if (hasJoinArg && joinScriptUrl.empty()) { int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0); @@ -125,7 +125,7 @@ void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* return; } -#ifndef ARBITER +#ifndef SERVER if (bFlag && _stricmp(pszParam, "j") == 0) { hasJoinArg = true; diff --git a/Tadah.DLL/Hooks/ServerReplicator.cpp b/Tadah.DLL/Hooks/ServerReplicator.cpp index f52245a..cda8115 100644 --- a/Tadah.DLL/Hooks/ServerReplicator.cpp +++ b/Tadah.DLL/Hooks/ServerReplicator.cpp @@ -2,7 +2,7 @@ #include "Hooks/ServerReplicator.h" -#if defined(ARBITER) +#if defined(SERVER) static std::map rakPeers; diff --git a/Tadah.DLL/Include/Discord.h b/Tadah.DLL/Include/Discord.h index 9c40490..636dcea 100644 --- a/Tadah.DLL/Include/Discord.h +++ b/Tadah.DLL/Include/Discord.h @@ -8,7 +8,7 @@ #include "Configuration.h" #include "Hooks/CRoblox.h" -#ifndef ARBITER +#ifndef SERVER void InitializeDiscord(); void UpdatePresence(); diff --git a/Tadah.DLL/Include/Hooks/ServerReplicator.h b/Tadah.DLL/Include/Hooks/ServerReplicator.h index 2468302..cdd9ca9 100644 --- a/Tadah.DLL/Include/Hooks/ServerReplicator.h +++ b/Tadah.DLL/Include/Hooks/ServerReplicator.h @@ -2,7 +2,7 @@ #include "Configuration.h" -#if defined(ARBITER) +#if defined(SERVER) struct Packet { diff --git a/Tadah.DLL/dllmain.cpp b/Tadah.DLL/dllmain.cpp index 3c137c8..1e7ed04 100644 --- a/Tadah.DLL/dllmain.cpp +++ b/Tadah.DLL/dllmain.cpp @@ -2,7 +2,7 @@ #include "Configuration.h" #include "Patches.h" -#ifndef ARBITER +#ifndef SERVER #include "Discord.h" #endif @@ -13,7 +13,7 @@ #include "Hooks/Context.h" #endif -#ifdef ARBITER +#ifdef SERVER #include "Hooks/StandardOut.h" #include "Hooks/ServerReplicator.h" #endif @@ -31,16 +31,16 @@ ADD_PATCH(Crypt__verifySignatureBase64, Crypt__verifySignatureBase64_hook) ADD_PATCH(Context__requirePermission, Context__requirePermission_hook) #endif -#ifdef ARBITER +#ifdef SERVER ADD_PATCH(StandardOut__print, StandardOut__print_hook) #endif -#if defined(ARBITER) && defined(MFC2011) +#if defined(SERVER) && defined(MFC2011) ADD_PATCH(ServerReplicator__sendTop, ServerReplicator__sendTop_hook) ADD_PATCH(ServerReplicator__processTicket, ServerReplicator__processTicket_hook) #endif -#if defined(ARBITER) && defined(PLAYER2012) +#if defined(SERVER) && defined(PLAYER2012) ADD_PATCH(Application__ParseArguments, Application__ParseArguments_hook) #endif @@ -57,7 +57,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv { if (ul_reason_for_call == DLL_PROCESS_ATTACH) { -#ifdef ARBITER +#ifdef SERVER InitializeOutput(); #endif @@ -83,7 +83,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv ExitProcess(EXIT_FAILURE); } -#ifndef ARBITER +#ifndef SERVER InitializeDiscord(); #endif } @@ -92,7 +92,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv { curl_global_cleanup(); -#ifndef ARBITER +#ifndef SERVER CleanupDiscord(); #endif }