Skip to content

Commit

Permalink
Remove launcher related code.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Nov 11, 2015
1 parent 24130eb commit 1238327
Showing 1 changed file with 1 addition and 67 deletions.
68 changes: 1 addition & 67 deletions src/xrEngine/x_ray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ struct _SoundProcessor : public pureFrame
ENGINE_API CApplication* pApp = NULL;
static HWND logoWindow = NULL;

int doLauncher();
void doBenchmark(LPCSTR name);
ENGINE_API bool g_bBenchmark = false;
string512 g_sBenchmarkName;
Expand Down Expand Up @@ -800,14 +799,7 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
g_SASH.Init(sash_arg);
g_SASH.MainLoop();
return 0;
}
if (strstr(lpCmdLine, "-launcher"))
{
int l_res = doLauncher();
if (l_res != 0)
return 0;
}

}
#ifndef DEDICATED_SERVER
if (strstr(Core.Params, "-r2a"))
Console->Execute("renderer renderer_r2a");
Expand Down Expand Up @@ -1386,64 +1378,6 @@ void CApplication::LoadAllArchives()
}
}

//launcher stuff----------------------------
extern "C" {
typedef int __cdecl LauncherFunc(int);
}
HMODULE hLauncher = NULL;
LauncherFunc* pLauncher = NULL;

void InitLauncher()
{
if (hLauncher)
return;
hLauncher = LoadLibrary("xrLauncher.dll");
if (0 == hLauncher) R_CHK(GetLastError());
R_ASSERT2(hLauncher, "xrLauncher DLL raised exception during loading or there is no xrLauncher.dll at all");

pLauncher = (LauncherFunc*)GetProcAddress(hLauncher, "RunXRLauncher");
R_ASSERT2(pLauncher, "Cannot obtain RunXRLauncher function from xrLauncher.dll");
};

void FreeLauncher()
{
if (hLauncher)
{
FreeLibrary(hLauncher);
hLauncher = NULL;
pLauncher = NULL;
};
}

int doLauncher()
{
/*
execUserScript();
InitLauncher();
int res = pLauncher(0);
FreeLauncher();
if(res == 1) // do benchmark
g_bBenchmark = true;
if(g_bBenchmark){ //perform benchmark cycle
doBenchmark();
// InitLauncher ();
// pLauncher (2); //show results
// FreeLauncher ();
Core._destroy ();
return (1);
};
if(res==8){//Quit
Core._destroy ();
return (1);
}
*/
return 0;
}

void doBenchmark(LPCSTR name)
{
g_bBenchmark = true;
Expand Down

0 comments on commit 1238327

Please sign in to comment.