From c0b768278f3e3f128eec2a413039723a8b8cb75e Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sat, 22 Apr 2017 10:24:12 +0200 Subject: [PATCH] Fix build with SDL 1.2 --- src/backends/sdl/refresh.c | 2 +- src/client/cl_cin.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/backends/sdl/refresh.c b/src/backends/sdl/refresh.c index b80bac04..aa030e12 100644 --- a/src/backends/sdl/refresh.c +++ b/src/backends/sdl/refresh.c @@ -295,7 +295,7 @@ GLimp_InitGraphics(qboolean fullscreen, int *pwidth, int *pheight) { if (!CreateSDLWindow(flags, width, height)) { - if (flags & SDL_WINDOW_OPENGL) + if (flags & SDL_OPENGL) { if (gl_msaa_samples->value) { diff --git a/src/client/cl_cin.c b/src/client/cl_cin.c index 4b0ab82b..36b278b4 100644 --- a/src/client/cl_cin.c +++ b/src/client/cl_cin.c @@ -26,6 +26,7 @@ */ #include "header/client.h" +#include "../backends/generic/header/input.h" cvar_t *cin_force43; @@ -576,11 +577,7 @@ SCR_PlayCinematic(char *arg) byte *palette; char name[MAX_OSPATH], *dot; - /* Make sure that all keys are marked up. Under - some circumstances cinematics are started with - at least one key marked down, causing them to - abort right after the first frame... */ - Key_MarkAllUp(); + In_FlushQueue(); /* make sure background music is not playing */ #ifdef CDA