xrEngine: separate xrRender_R* and xrGame initialization

A bit of cleanup

Author: Xottab-DUTY

src/xrEngine/EngineAPI.cpp

@@ -130,27 +130,21 @@ void CEngineAPI::InitializeRenderers()
 
 void CEngineAPI::Initialize(void)
 {
-    InitializeRenderers();
+    hGame = std::make_unique<XRay::Module>("xrGame");
 
-    // game
-    {
-        constexpr pcstr g_name = "xrGame";
-        hGame = std::make_unique<XRay::Module>(g_name);
-
-        if (!hGame->exist())
-            R_CHK(GetLastError());
-        R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
+    if (!hGame->exist())
+        R_CHK(GetLastError());
+    R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
 
-        pCreate = (Factory_Create*)hGame->getProcAddress("xrFactory_Create");
-        R_ASSERT(pCreate);
+    pCreate = (Factory_Create*)hGame->getProcAddress("xrFactory_Create");
+    R_ASSERT(pCreate);
 
-        pDestroy = (Factory_Destroy*)hGame->getProcAddress("xrFactory_Destroy");
-        R_ASSERT(pDestroy);
-    }
+    pDestroy = (Factory_Destroy*)hGame->getProcAddress("xrFactory_Destroy");
+    R_ASSERT(pDestroy);
 
     //////////////////////////////////////////////////////////////////////////
     // vTune
-    tune_enabled = FALSE;
+    tune_enabled = false;
     if (strstr(Core.Params, "-tune"))
     {
         constexpr pcstr g_name = "vTuneAPI";
@@ -194,11 +188,11 @@ void CEngineAPI::CreateRendererList()
     vid_quality_token[0].name = xr_strdup("renderer_r1");
 
     vid_quality_token[1].id = -1;
-    vid_quality_token[1].name = NULL;
+    vid_quality_token[1].name = nullptr;
 
 #else
     // TODO: ask renderers if they are supported!
-    if (vid_quality_token != NULL)
+    if (vid_quality_token != nullptr)
         return;
     bool bSupports_r2 = false;
     bool bSupports_r2_5 = false;

src/xrEngine/EngineAPI.h

@@ -54,7 +54,7 @@ class ENGINE_API CEngineAPI
     BENCH_SEC_SCRAMBLEMEMBER1
     Factory_Create* pCreate;
     Factory_Destroy* pDestroy;
-    BOOL tune_enabled;
+    bool tune_enabled;
     VTPause* tune_pause;
     VTResume* tune_resume;
     void Initialize();

src/xrEngine/main.cpp

@@ -42,7 +42,6 @@ void InitEngine()
     Device.Initialize();
 }
 
-static void InitEngineExt() { Engine.External.Initialize(); }
 namespace
 {
 struct PathIncludePred
@@ -393,7 +392,8 @@ int RunApplication(pcstr commandLine)
 #else
     Console->Execute("renderer renderer_r1");
 #endif
-    InitEngineExt(); // load xrRender and xrGame
+    Engine.External.InitializeRenderers();
+    Engine.External.Initialize();
     Startup();
     Core._destroy();
     // check for need to execute something external