From 2795088e86f8194e28e61fce077955d5ea325509 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Mon, 23 Jun 2014 18:27:17 +0200 Subject: [PATCH] Initialize the screen handling code before the renderer This change is needed to break a otherwise fatal cycle: - The renderer calls VID_MenuInit() - VID_MenuInit() calls SCR_GetMenuScale() - SCR_GetMenuScale() relies on gl_menuscale which is still uninitialized at this time. --- src/client/cl_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/cl_main.c b/src/client/cl_main.c index d7ef8089..5a36547a 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -873,6 +873,8 @@ CL_Init(void) S_Init(); + SCR_Init(); + VID_Init(); V_Init(); @@ -883,8 +885,6 @@ CL_Init(void) M_Init(); - SCR_Init(); - cls.disable_screen = true; /* don't draw yet */ #ifdef CDA