@@ -169,7 +169,6 @@ struct _SoundProcessor : public pureFrame
169169ENGINE_API CApplication* pApp = NULL ;
170170static HWND logoWindow = NULL ;
171171
172- int doLauncher ();
173172void doBenchmark (LPCSTR name);
174173ENGINE_API bool g_bBenchmark = false ;
175174string512 g_sBenchmarkName;
@@ -800,14 +799,7 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
800799 g_SASH.Init (sash_arg);
801800 g_SASH.MainLoop ();
802801 return 0 ;
803- }
804- if (strstr (lpCmdLine, " -launcher" ))
805- {
806- int l_res = doLauncher ();
807- if (l_res != 0 )
808- return 0 ;
809- }
810-
802+ }
811803#ifndef DEDICATED_SERVER
812804 if (strstr (Core.Params , " -r2a" ))
813805 Console->Execute (" renderer renderer_r2a" );
@@ -1386,64 +1378,6 @@ void CApplication::LoadAllArchives()
13861378 }
13871379}
13881380
1389- // launcher stuff----------------------------
1390- extern " C" {
1391- typedef int __cdecl LauncherFunc (int );
1392- }
1393- HMODULE hLauncher = NULL ;
1394- LauncherFunc* pLauncher = NULL ;
1395-
1396- void InitLauncher ()
1397- {
1398- if (hLauncher)
1399- return ;
1400- hLauncher = LoadLibrary (" xrLauncher.dll" );
1401- if (0 == hLauncher) R_CHK (GetLastError ());
1402- R_ASSERT2 (hLauncher, " xrLauncher DLL raised exception during loading or there is no xrLauncher.dll at all" );
1403-
1404- pLauncher = (LauncherFunc*)GetProcAddress (hLauncher, " RunXRLauncher" );
1405- R_ASSERT2 (pLauncher, " Cannot obtain RunXRLauncher function from xrLauncher.dll" );
1406- };
1407-
1408- void FreeLauncher ()
1409- {
1410- if (hLauncher)
1411- {
1412- FreeLibrary (hLauncher);
1413- hLauncher = NULL ;
1414- pLauncher = NULL ;
1415- };
1416- }
1417-
1418- int doLauncher ()
1419- {
1420- /*
1421- execUserScript();
1422- InitLauncher();
1423- int res = pLauncher(0);
1424- FreeLauncher();
1425- if(res == 1) // do benchmark
1426- g_bBenchmark = true;
1427-
1428- if(g_bBenchmark){ //perform benchmark cycle
1429- doBenchmark();
1430-
1431- // InitLauncher ();
1432- // pLauncher (2); //show results
1433- // FreeLauncher ();
1434-
1435- Core._destroy ();
1436- return (1);
1437-
1438- };
1439- if(res==8){//Quit
1440- Core._destroy ();
1441- return (1);
1442- }
1443- */
1444- return 0 ;
1445- }
1446-
14471381void doBenchmark (LPCSTR name)
14481382{
14491383 g_bBenchmark = true ;
0 commit comments