Merge branch 'dev' into future_changes_for_coc

OpenXRay · Nov 22, 2023 · 74b3eb8 · 74b3eb8
2 parents e90e224 + 679e6a1
commit 74b3eb8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/Externals/xrLuaFix b/Externals/xrLuaFix
diff --git a/src/Layers/xrRenderPC_GL/r2_test_hw.cpp b/src/Layers/xrRenderPC_GL/r2_test_hw.cpp
@@ -2,8 +2,8 @@
 
 class sdl_window_test_helper
 {
-    SDL_Window* m_window = nullptr;
-    SDL_GLContext m_context = nullptr;
+    SDL_Window* m_window{};
+    SDL_GLContext m_context{};
 
 public:
     sdl_window_test_helper()
@@ -25,6 +25,7 @@ class sdl_window_test_helper
         }
     }
 
+    [[nodiscard]]
     bool successful() const
     {
         return m_window && m_context;
@@ -37,24 +38,22 @@ class sdl_window_test_helper
     }
 };
 
-bool TestOpenGLSupport()
+BOOL xrRender_test_hw()
 {
     // Check if minimal required OpenGL features are available
     const sdl_window_test_helper windowTest;
     if (!windowTest.successful())
-        return false;
+        return FALSE;
 
     GLenum err = glewInit();
     if (GLEW_OK != err)
     {
-         Log("~ Could not initialize glew:", (pcstr)glewGetErrorString(err));
-         return false;
+        Log("~ Could not initialize glew:", (pcstr)glewGetErrorString(err));
+        return FALSE;
     }
 
-    return true;
-}
+    if (!GLEW_ARB_framebuffer_object)
+        return FALSE;
 
-BOOL xrRender_test_hw()
-{
-    return TestOpenGLSupport() ? TRUE : FALSE;
+    return TRUE;
 }
diff --git a/src/xrServerEntities/xml_str_id_loader.h b/src/xrServerEntities/xml_str_id_loader.h
@@ -90,7 +90,7 @@ const ITEM_DATA* CSXML_IdToIndex::GetById(const shared_str& str_id, bool no_asse
 
     if (it == m_pItemDataVector->end())
     {
-#ifndef MASTER_GOLD
+#if 0 // ndef MASTER_GOLD
         int i = 0;
         for (it = m_pItemDataVector->begin(); m_pItemDataVector->end() != it; ++it, i++)
             Msg("[%d]=[%s]", i, *(*it).id);