From 8ac4df3d6f0843cacc4e8df0a8de40d00146cfe2 Mon Sep 17 00:00:00 2001 From: Kevin Shanahan Date: Wed, 27 Mar 2013 17:22:59 +1030 Subject: [PATCH] vid: init cvars before first mode set Otherwise, the vid_mode cvar gets inited to zero and we change immediately back to mode 0. Signed-off-by: Kevin Shanahan --- common/vid_sdl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/vid_sdl.c b/common/vid_sdl.c index 78f17cf..de9f9b7 100644 --- a/common/vid_sdl.c +++ b/common/vid_sdl.c @@ -986,6 +986,20 @@ VID_Init(unsigned char *palette) /* (byte *palette, byte *colormap) */ int err; SDL_DisplayMode desktop_mode; + Cvar_RegisterVariable(&vid_mode); + Cvar_RegisterVariable(&vid_wait); + Cvar_RegisterVariable(&vid_nopageflip); + Cvar_RegisterVariable(&_vid_wait_override); + Cvar_RegisterVariable(&_vid_default_mode); + Cvar_RegisterVariable(&_vid_default_mode_win); + Cvar_RegisterVariable(&vid_fullscreen_mode); + Cvar_RegisterVariable(&vid_windowed_mode); + Cvar_RegisterVariable(&block_switch); + Cvar_RegisterVariable(&vid_window_x); + Cvar_RegisterVariable(&vid_window_y); + + Cmd_AddCommand("vid_describemodes", VID_DescribeModes_f); + /* * Init SDL and the video subsystem */ @@ -1015,20 +1029,6 @@ VID_Init(unsigned char *palette) /* (byte *palette, byte *colormap) */ vid_menudrawfn = VID_MenuDraw; vid_menukeyfn = VID_MenuKey; - - Cvar_RegisterVariable(&vid_mode); - Cvar_RegisterVariable(&vid_wait); - Cvar_RegisterVariable(&vid_nopageflip); - Cvar_RegisterVariable(&_vid_wait_override); - Cvar_RegisterVariable(&_vid_default_mode); - Cvar_RegisterVariable(&_vid_default_mode_win); - Cvar_RegisterVariable(&vid_fullscreen_mode); - Cvar_RegisterVariable(&vid_windowed_mode); - Cvar_RegisterVariable(&block_switch); - Cvar_RegisterVariable(&vid_window_x); - Cvar_RegisterVariable(&vid_window_y); - - Cmd_AddCommand("vid_describemodes", VID_DescribeModes_f); } void