chore: merge 8e673e1 -> 5bde979 from prod
This commit is contained in:
parent
99a652ed3e
commit
729c3973b8
|
|
@ -20,10 +20,32 @@ CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam = (CRobl
|
||||||
|
|
||||||
BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this)
|
BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this)
|
||||||
{
|
{
|
||||||
|
if (!CRobloxApp__InitInstance(_this))
|
||||||
|
{
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef PLAYER
|
#ifdef PLAYER
|
||||||
|
#ifdef _DEBUG
|
||||||
|
if (!hasAuthenticationUrl)
|
||||||
|
{
|
||||||
|
MessageBoxA(nullptr, "Missing authentication URL", "Kiseki", MB_OK | MB_ICONERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasAuthenticationTicket)
|
||||||
|
{
|
||||||
|
MessageBoxA(nullptr, "Missing authentication ticket", "Kiseki", MB_OK | MB_ICONERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasJoinScriptUrl)
|
||||||
|
{
|
||||||
|
MessageBoxA(nullptr, "Missing join script URL", "Kiseki", MB_OK | MB_ICONERROR);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!hasAuthenticationUrl || !hasAuthenticationTicket || !hasJoinScriptUrl)
|
if (!hasAuthenticationUrl || !hasAuthenticationTicket || !hasJoinScriptUrl)
|
||||||
{
|
{
|
||||||
ShellExecute(0, 0, L"https://kiseki.lol/games", 0, 0, SW_SHOW);
|
ShellExecuteW(0, 0, L"https://kiseki.lol/games", 0, 0, SW_SHOW);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -31,15 +53,13 @@ BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this)
|
||||||
#ifdef SERVER
|
#ifdef SERVER
|
||||||
if (!hasJobId)
|
if (!hasJobId)
|
||||||
{
|
{
|
||||||
|
#ifdef _DEBUG
|
||||||
|
MessageBoxA(nullptr, "Missing job ID", "Kiseki", MB_OK | MB_ICONERROR);
|
||||||
|
#endif
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!CRobloxApp__InitInstance(_this))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
CApp* app = reinterpret_cast<CApp*>(CLASSLOCATION_CAPP);
|
CApp* app = reinterpret_cast<CApp*>(CLASSLOCATION_CAPP);
|
||||||
|
|
||||||
if (hasAuthenticationUrl && hasAuthenticationTicket && !authenticationUrl.empty() && !authenticationTicket.empty())
|
if (hasAuthenticationUrl && hasAuthenticationTicket && !authenticationUrl.empty() && !authenticationTicket.empty())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue