Index: binaries/data/mods/public/gui/pregame/SplashscreenHandler.js =================================================================== --- binaries/data/mods/public/gui/pregame/SplashscreenHandler.js +++ binaries/data/mods/public/gui/pregame/SplashscreenHandler.js @@ -32,36 +32,6 @@ if (Engine.ConfigDB_GetValue("user", "gui.splashscreen.enable") === "true" || Engine.ConfigDB_GetValue("user", "gui.splashscreen.version") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt")) - Engine.PushGuiPage("page_splashscreen.xml", {}, this.showRenderPathMessage); - else - this.showRenderPathMessage(); - } - - showRenderPathMessage() - { - // Warn about removing fixed render path - if (Engine.Renderer_GetRenderPath() != "fixed") - return; - - messageBox( - 600, 300, - "[font=\"sans-bold-16\"]" + - sprintf(translate("%(warning)s You appear to be using non-shader (fixed function) graphics. This option will be removed in a future 0 A.D. release, to allow for more advanced graphics features. We advise upgrading your graphics card to a more recent, shader-compatible model."), { - "warning": coloredText("Warning:", "200 20 20") - }) + - "\n\n" + - // Translation: This is the second paragraph of a warning. The - // warning explains that the user is using “non-shader“ graphics, - // and that in the future this will not be supported by the game, so - // the user will need a better graphics card. - translate("Please press \"Read More\" for more information or \"OK\" to continue."), - translate("WARNING!"), - [translate("OK"), translate("Read More")], - [ - null, - () => { - Engine.OpenURL("https://www.wildfiregames.com/forum/index.php?showtopic=16734"); - } - ]); + Engine.PushGuiPage("page_splashscreen.xml", {}); } } Index: source/ps/GameSetup/GameSetup.cpp =================================================================== --- source/ps/GameSetup/GameSetup.cpp +++ source/ps/GameSetup/GameSetup.cpp @@ -95,6 +95,7 @@ extern void RestartEngine(); +#include #include #include @@ -999,16 +1000,19 @@ g_GUI = new CGUIManager(); // (must come after SetVideoMode, since it calls ogl_Init) - if (ogl_HaveExtensions(0, "GL_ARB_vertex_program", "GL_ARB_fragment_program", NULL) != 0 // ARB + CStr8 renderPath = "default"; + CFG_GET_VAL("renderpath", renderPath); + 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 + || RenderPathEnum::FromString(renderPath) == FIXED) { 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" The game does not support pre-shader graphics cards." L" You are advised to try installing newer drivers and/or upgrade your graphics card." L" For more information, please see http://www.wildfiregames.com/forum/index.php?showtopic=16734" ); - // TODO: actually quit once fixed function support is dropped + exit(EXIT_FAILURE); } const char* missing = ogl_HaveExtensions(0,