R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check if dedicated using global

Browse Source 
Global instead of directive as the ebisusdk lib is used for both the server and client. Removed useless directives.
This commit is contained in:
Kawe Mazidjatari 2023-05-13 19:41:57 +02:00
parent e468fa1065
commit 0c25246f91
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
r5dev/ebisusdk/EbisuSDK.cpp
View File

@ -1,17 +1,19 @@
#include "core/stdafx.h"
#include "tier1/cvar.h"
#include "ebisusdk/EbisuSDK.h"
#include "engine/server/sv_main.h"
//-----------------------------------------------------------------------------
// Purpose: sets the EbisuSDK globals for dedicated to satisfy command callbacks
//-----------------------------------------------------------------------------
void HEbisuSDK_Init()
{
#ifdef DEDICATED
*g_EbisuSDKInit = true; // <- 1st EbisuSDK
*g_EbisuProfileInit = true; // <- 2nd EbisuSDK
*g_NucleusID = 9990000; // <- 3rd EbisuSDK
#endif // DEDICATED
if (*s_bIsDedicated)
{
*g_EbisuSDKInit = true; // <- 1st EbisuSDK
*g_EbisuProfileInit = true; // <- 2nd EbisuSDK
*g_NucleusID = 9990000; // <- 3rd EbisuSDK
}
}
//-----------------------------------------------------------------------------
@ -20,23 +22,23 @@ void HEbisuSDK_Init()
//-----------------------------------------------------------------------------
bool IsOriginInitialized()
{
#ifndef DEDICATED
if ((!(*g_OriginErrorLevel)
if (*s_bIsDedicated)
{
return true;
}
else if ((!(*g_OriginErrorLevel)
&& (*g_EbisuSDKInit)
&& (*g_NucleusID)
&& (*g_EbisuProfileInit)))
// && (*g_OriginAuthCode)
// && (g_NucleusToken[0])))
#endif // DEDICATED
{
return true;
}
#ifndef DEDICATED
return false;
#endif // DEDICATED
}
#ifndef CLIENT_DLL
//-----------------------------------------------------------------------------
// Purpose: validates if client's persona name meets EA's criteria
// Input : *pszName -
@ -61,4 +63,3 @@ bool IsValidPersonaName(const char* pszName)
size_t pos = strspn(pszName, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_");
return pszName[pos] == '\0';
}
#endif // !CLIENT_DLL

4
r5dev/ebisusdk/EbisuSDK.h
View File

@ -1,6 +1,5 @@
#pragma once
//#ifdef DEDICATED
inline CMemory p_EbisuSDK_Tier0_Init;
inline auto EbisuSDK_Tier0_Init = p_EbisuSDK_Tier0_Init.RCast<void(*)(void)>();
@ -16,14 +15,11 @@ inline char* g_OriginAuthCode = nullptr; /*SIZE = 256*/
inline int* g_OriginErrorLevel = nullptr;
inline bool* g_EbisuSDKInit = nullptr;
inline bool* g_EbisuProfileInit = nullptr;
//#endif // DEDICATED
///////////////////////////////////////////////////////////////////////////////
void HEbisuSDK_Init();
bool IsOriginInitialized();
#ifndef CLIENT_DLL
bool IsValidPersonaName(const char* pszName);
#endif // !CLIENT_DLL
///////////////////////////////////////////////////////////////////////////////
class VEbisuSDK : public IDetour