aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL/masterserver
diff options
context:
space:
mode:
Diffstat (limited to 'NorthstarDLL/masterserver')
-rw-r--r--NorthstarDLL/masterserver/masterserver.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/NorthstarDLL/masterserver/masterserver.cpp b/NorthstarDLL/masterserver/masterserver.cpp
index 21b76f73..53a5fa9a 100644
--- a/NorthstarDLL/masterserver/masterserver.cpp
+++ b/NorthstarDLL/masterserver/masterserver.cpp
@@ -3,6 +3,7 @@
#include "shared/playlist.h"
#include "server/auth/serverauthentication.h"
#include "core/tier0.h"
+#include "core/vanilla.h"
#include "engine/r2engine.h"
#include "mods/modmanager.h"
#include "shared/misccommands.h"
@@ -88,7 +89,7 @@ size_t CurlWriteToStringBufferCallback(char* contents, size_t size, size_t nmemb
void MasterServerManager::AuthenticateOriginWithMasterServer(const char* uid, const char* originToken)
{
- if (m_bOriginAuthWithMasterServerInProgress)
+ if (m_bOriginAuthWithMasterServerInProgress || g_pVanillaCompatibility->GetVanillaCompatibility())
return;
// do this here so it's instantly set
@@ -466,7 +467,7 @@ void MasterServerManager::RequestMainMenuPromos()
void MasterServerManager::AuthenticateWithOwnServer(const char* uid, const char* playerToken)
{
// dont wait, just stop if we're trying to do 2 auth requests at once
- if (m_bAuthenticatingWithGameServer)
+ if (m_bAuthenticatingWithGameServer || g_pVanillaCompatibility->GetVanillaCompatibility())
return;
m_bAuthenticatingWithGameServer = true;
@@ -601,7 +602,7 @@ void MasterServerManager::AuthenticateWithOwnServer(const char* uid, const char*
void MasterServerManager::AuthenticateWithServer(const char* uid, const char* playerToken, RemoteServerInfo server, const char* password)
{
// dont wait, just stop if we're trying to do 2 auth requests at once
- if (m_bAuthenticatingWithGameServer)
+ if (m_bAuthenticatingWithGameServer || g_pVanillaCompatibility->GetVanillaCompatibility())
return;
m_bAuthenticatingWithGameServer = true;