Ticket #1419: GameSetup.cpp.patch

source/ps/GameSetup/GameSetup.cpp

@@ -26 +26 @@
 #include "lib/file/common/file_stats.h"
 #include "lib/res/h_mgr.h"
 #include "lib/res/graphics/cursor.h"
+
 #include "lib/sysdep/cursor.h"
 #include "lib/sysdep/cpu.h"
 #include "lib/sysdep/gfx.h"
 #include "lib/sysdep/os_cpu.h"
-#include "lib/tex/tex.h"
+#include "lib/sysdep/sysdep.h"
 #if OS_WIN
 #include "lib/sysdep/os/win/wversion.h"
 #endif
 
+#include "lib/tex/tex.h"
+
 #include "graphics/CinemaTrack.h"
 #include "graphics/GameView.h"
 #include "graphics/LightEnv.h"
@@ -984 +987 @@
         ISoundManager::SetEnabled(false);
 
     g_GUI = new CGUIManager(g_ScriptingHost.GetScriptInterface());
+    
 
+    wchar_t buf[500];
+    wchar_t caption[128];
     // (must come after SetVideoMode, since it calls ogl_Init)
     if (ogl_HaveExtensions(0, "GL_ARB_vertex_program", "GL_ARB_fragment_program", NULL) != 0 // ARB
         && ogl_HaveExtensions(0, "GL_ARB_vertex_shader", "GL_ARB_fragment_shader", NULL) != 0) // GLSL
     {
-        DEBUG_DISPLAY_ERROR(
-            L"Your graphics card doesn't appear to be fully compatible with OpenGL shaders."
-            L" In the future, the game will not support pre-shader graphics cards."
-            L" You are advised to try installing newer drivers and/or upgrade your graphics card."
+
+        swprintf_s(buf, ARRAY_SIZE(buf),
+            L"Your graphics card doesn't appear to be fully compatible with OpenGL shaders.\n"
+            L" In the future, the game will not support pre-shader graphics cards.\n\n"
+            L" You are advised to try installing newer drivers and/or upgrade your graphics card.\n\n"
             L" For more information, please see http://www.wildfiregames.com/forum/index.php?showtopic=16734"
-        );
+            );
+        swprintf_s(caption,ARRAY_SIZE(caption),L"No OpenGL shaders!");
+        sys_display_msg(caption,buf);
         // TODO: actually quit once fixed function support is dropped
     }
 
@@ -1006 +1015 @@
         NULL);
     if(missing)
     {
-        wchar_t buf[500];
+        
         swprintf_s(buf, ARRAY_SIZE(buf),
-            L"The %hs extension doesn't appear to be available on your computer."
-            L" The game may still work, though - you are welcome to try at your own risk."
-            L" If not or it doesn't look right, upgrade your graphics card.",
+            L"The %hs extension doesn't appear to be available on your computer.\n"
+            L" The game may still work, though - you are welcome to try at your own risk.\n\n"
+            L" If not or it doesn't look right, upgrade your graphics card.\n",
             missing
         );
-        DEBUG_DISPLAY_ERROR(buf);
+        swprintf_s(caption,ARRAY_SIZE(caption),L"Missing %hs extension!",missing);
+        sys_display_msg(caption,buf);
         // TODO: i18n
     }
 
     if (!ogl_HaveExtension("GL_ARB_texture_env_crossbar"))
     {
-        DEBUG_DISPLAY_ERROR(
-            L"The GL_ARB_texture_env_crossbar extension doesn't appear to be available on your computer."
-            L" Shadows are not available and overall graphics quality might suffer."
-            L" You are advised to try installing newer drivers and/or upgrade your graphics card.");
+
+        swprintf_s(caption,ARRAY_SIZE(caption),L"Missing GL_ARB_texture_env_crossbar extension!");
+        swprintf_s(buf,ARRAY_SIZE(buf),
+            L"The GL_ARB_texture_env_crossbar extension doesn't appear to be available on your computer.\n"
+            L" Shadows are not available and overall graphics quality might suffer.\n\n"
+            L" You are advised to try installing newer drivers and/or upgrade your graphics card."
+        );
+        sys_display_msg(caption,buf);
+
         g_Shadows = false;
     }
 
     ogl_WarnIfError();
+    
     InitRenderer();
 
     InitInput();