From a39d6740c519ebcb605c09e4a48f0d61207c25b0 Mon Sep 17 00:00:00 2001 From: Lance Date: Sun, 3 Apr 2011 04:49:33 +0000 Subject: [PATCH] "Apply" menu option now works on D3D builds (when changing 3d, 2d resolutions etc) git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3771 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/renderer.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/engine/client/renderer.c b/engine/client/renderer.c index 588a9e2eb..0e244f6fd 100644 --- a/engine/client/renderer.c +++ b/engine/client/renderer.c @@ -975,17 +975,28 @@ qboolean M_VideoApply (union menuoption_s *op,struct menu_s *menu,int key) switch(info->renderer->selectedoption) { -#ifdef GLQUAKE +#if defined(GLQUAKE) && !defined(D3DQUAKE) // Just OpenGL client case 0: Cbuf_AddText("setrenderer gl\n", RESTRICT_LOCAL); break; #endif -#ifdef D3DQUAKE + +#if defined(D3DQUAKE) && !defined(GLQUAKE) // Just Direct3D client + case 0: + Cbuf_AddText("setrenderer d3d\n", RESTRICT_LOCAL); + break; +#endif + +#if defined(GLQUAKE) && defined(D3DQUAKE) // OpenGL + Direct3D = Merged + case 0: + Cbuf_AddText("setrenderer gl\n", RESTRICT_LOCAL); + break; case 1: Cbuf_AddText("setrenderer d3d\n", RESTRICT_LOCAL); break; #endif } + M_RemoveMenu(menu); Cbuf_AddText("menu_video\n", RESTRICT_LOCAL); return true;