Merge remote-tracking branch 'upstream/xd_dev' into xd_dev

Author: q4a

src/utils/xrAI/xrAI.cpp

@@ -121,8 +121,6 @@ void execute(LPSTR cmd)
 
             CGameSpawnConstructor(name, output, start, !!no_separator_check);
 
-            hFactory->Close();
-
             create_entity = nullptr;
             destroy_entity = nullptr;
         }

src/utils/xrSE_Factory/xrSE_Factory.cpp

@@ -63,7 +63,7 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved)
         xr_delete(g_ai_space);
         xr_delete(g_object_factory);
         if (prop_helper_module)
-            prop_helper_module->Сlose();
+            prop_helper_module = nullptr;
         //Core._destroy();
         break;
     }

src/xrEngine/EngineAPI.cpp

@@ -208,21 +208,19 @@ void CEngineAPI::Destroy(void)
 
 void CEngineAPI::CreateRendererList()
 {
+    if (!vid_quality_token.empty())
+        return;
+
     hRenderR1 = XRay::LoadModule("xrRender_R1");
 
-    xr_vector<xr_token> modes;
     if (GEnv.isDedicatedServer)
     {
         R_ASSERT2(hRenderR1->IsLoaded(), "Dedicated server needs xrRender_R1 to work");
-        modes.emplace_back(xr_token("renderer_r1", 0));
-        modes.emplace_back(xr_token(nullptr, -1));
-        vid_quality_token = std::move(modes);
+        vid_quality_token.emplace_back(xr_token("renderer_r1", 0));
+        vid_quality_token.emplace_back(xr_token(nullptr, -1));
         return;
     }
 
-    if (!vid_quality_token.empty())
-        return;
-
     // Hide "d3d10.dll not found" message box for XP
     SetErrorMode(SEM_FAILCRITICALERRORS);
 
@@ -234,6 +232,8 @@ void CEngineAPI::CreateRendererList()
     // Restore error handling
     SetErrorMode(0);
 
+    auto& modes = vid_quality_token;
+
     if (hRenderR1->IsLoaded())
     {
         modes.emplace_back(xr_token("renderer_r1", 0));
@@ -252,30 +252,28 @@ void CEngineAPI::CreateRendererList()
         if (GEnv.CheckR3 && GEnv.CheckR3())
             modes.emplace_back(xr_token("renderer_r3", 4));
         else
-            hRenderR3->Сlose();
+            hRenderR3->Close();
     }
 
     if (hRenderR4->IsLoaded())
     {
         if (GEnv.CheckR4 && GEnv.CheckR4())
             modes.emplace_back(xr_token("renderer_r4", 5));
         else
-            hRenderR4->Сlose();
+            hRenderR4->Close();
     }
 
     if (hRenderRGL->IsLoaded())
     {
         if (GEnv.CheckRGL && GEnv.CheckRGL())
             modes.emplace_back(xr_token("renderer_gl", 6));
         else
-            hRenderRGL->Сlose();
+            hRenderRGL->Close();
     }
     modes.emplace_back(xr_token(nullptr, -1));
 
     Msg("Available render modes[%d]:", modes.size());
     for (const auto& mode : modes)
         if (mode.name)
             Log(mode.name);
-
-    vid_quality_token = std::move(modes);
 }