Add .vscode to .gitignore

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 12214d2ab5b70cfa962ce8ff797188de247cae28..0b37e274a28fdfdfd60bfb9cd6c01052f96c1e26 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1338,7 +1338,7 @@ void VID_Init (void)
                Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
        vid_sdl_initjoysticksystem = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0;
        if (!vid_sdl_initjoysticksystem)
-               Con_Printf("Failed to init SDL joystick subsystem: %s\n", SDL_GetError());
+               Con_Errorf("Failed to init SDL joystick subsystem: %s\n", SDL_GetError());
        vid_isfullscreen = false;
 }
 
@@ -1392,7 +1392,7 @@ void VID_EnableJoystick(qboolean enable)
                        }
                        else
                        {
-                               Con_Printf("Joystick %i failed (SDL_JoystickOpen(%i) returned: %s)\n", index, sdlindex, SDL_GetError());
+                               Con_Errorf("Joystick %i failed (SDL_JoystickOpen(%i) returned: %s)\n", index, sdlindex, SDL_GetError());
                                sdlindex = -1;
                        }
                }
@@ -1459,6 +1459,12 @@ static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect)
 }
 #endif
 
+extern cvar_t gl_info_vendor;
+extern cvar_t gl_info_renderer;
+extern cvar_t gl_info_version;
+extern cvar_t gl_info_platform;
+extern cvar_t gl_info_driver;
+
 static qboolean VID_InitModeGL(viddef_mode_t *mode)
 {
        int windowflags = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL;
@@ -1487,7 +1493,7 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
                drivername = com_argv[i + 1];
        if (SDL_GL_LoadLibrary(drivername) < 0)
        {
-               Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());
+               Con_Errorf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());
                return false;
        }
 #endif
@@ -1556,7 +1562,7 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        window = SDL_CreateWindow(gamename, xPos, yPos, mode->width, mode->height, windowflags);
        if (window == NULL)
        {
-               Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError());
+               Con_Errorf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError());
                VID_Shutdown();
                return false;
        }
@@ -1564,7 +1570,7 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        context = SDL_GL_CreateContext(window);
        if (context == NULL)
        {
-               Con_Printf("Failed to initialize OpenGL context: %s\n", SDL_GetError());
+               Con_Errorf("Failed to initialize OpenGL context: %s\n", SDL_GetError());
                VID_Shutdown();
                return false;
        }
@@ -1577,11 +1583,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        GL_Setup();
 
        // VorteX: set other info
-       extern cvar_t gl_info_vendor;
-       extern cvar_t gl_info_renderer;
-       extern cvar_t gl_info_version;
-       extern cvar_t gl_info_platform;
-       extern cvar_t gl_info_driver;
        Cvar_SetQuick(&gl_info_vendor, gl_vendor);
        Cvar_SetQuick(&gl_info_renderer, gl_renderer);
        Cvar_SetQuick(&gl_info_version, gl_version);