Allow OpenGL only if -gl key is specified

xrEngine/pure.h: made message const xrGame/console_commands.cpp: fix to g_inv_highlight_equipped
OpenXRay · May 26, 2018 · a745819 · a745819 · q4a · May 27, 2018
1 parent 614c467
commit a745819
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
@@ -229,7 +229,10 @@ void CEngineAPI::CreateRendererList()
     hRenderR2 = XRay::LoadModule("xrRender_R2");
     hRenderR3 = XRay::LoadModule("xrRender_R3");
     hRenderR4 = XRay::LoadModule("xrRender_R4");
-    hRenderRGL = XRay::LoadModule("xrRender_GL");
+
+    const bool allowOGL = !!strstr(Core.Params, "-gl");
+    if (allowOGL)
+        hRenderRGL = XRay::LoadModule("xrRender_GL");
 
     // Restore error handling
     SetErrorMode(0);
@@ -263,7 +266,7 @@ void CEngineAPI::CreateRendererList()
             hRenderR4->close();
     }
 
-    if (hRenderRGL->exist())
+    if (allowOGL && hRenderRGL->exist())
     {
         if (GEnv.CheckRGL && GEnv.CheckRGL())
             modes.emplace_back(xr_token("renderer_gl", 6));

diff --git a/src/xrEngine/pure.h b/src/xrEngine/pure.h
@@ -104,7 +104,7 @@ class MessageRegistry
             messages[0].Object->OnPure();
         else
         {
-            for (auto& message : messages)
+            for (const auto& message : messages)
                 if (message.Prio != REG_PRIORITY_INVALID)
                     message.Object->OnPure();
         }

diff --git a/src/xrGame/console_commands.cpp b/src/xrGame/console_commands.cpp
@@ -1901,7 +1901,7 @@ void CCC_RegisterCommands()
     CMD3(CCC_Mask, "g_autopickup", &psActorFlags, AF_AUTOPICKUP);
     CMD3(CCC_Mask, "g_dynamic_music", &psActorFlags, AF_DYNAMIC_MUSIC);
     CMD3(CCC_Mask, "g_important_save", &psActorFlags, AF_IMPORTANT_SAVE);
-    CMD3(CCC_Integer, "g_inv_highlight_equipped", &g_inv_highlight_equipped, 0, 1);
+    CMD4(CCC_Integer, "g_inv_highlight_equipped", &g_inv_highlight_equipped, 0, 1);
 
 #ifdef DEBUG
     CMD1(CCC_ShowSmartCastStats, "show_smart_cast_stats");