ref: abb99ca40043c5a89855b78e6d4f929e4e2b7a0e
parent: 3fb46e6f9ca0c66556ecb060da92b74538cc9a2e
author: Fabian Greffrath <fabian@greffrath.com>
date: Tue Aug 25 07:52:57 EDT 2020
remove some SDL2 version checks for versions now mandatory
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -200,12 +200,8 @@
}
}
-#if defined(SDL_MIXER_VERSION_ATLEAST)
-#if SDL_MIXER_VERSION_ATLEAST(2,0,2)
// Initialize SDL_Mixer for MIDI music playback
Mix_Init(MIX_INIT_MID);
-#endif
-#endif
// Once initialization is complete, the temporary Timidity config
// file can be removed.
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -1075,18 +1075,6 @@
{int i;
- // SDL 2.0.6 has a bug that makes it unusable.
- if (SDL_COMPILEDVERSION == SDL_VERSIONNUM(2, 0, 6))
- {- I_Error(
- "I_SDL_InitSound: "
- "You are trying to launch with SDL 2.0.6 which has a known bug "
- "that makes the game crash. Please either downgrade to "
- "SDL 2.0.5 or upgrade to 2.0.7. See the following bug for some "
- "additional context:\n"
- "<https://github.com/chocolate-doom/chocolate-doom/issues/945>");
- }
-
use_sfx_prefix = _use_sfx_prefix;
// No sounds yet
--- a/src/i_timer.c
+++ b/src/i_timer.c
@@ -75,9 +75,8 @@
{// initialize timer
-#if SDL_VERSION_ATLEAST(2, 0, 5)
SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "1");
-#endif
+
SDL_Init(SDL_INIT_TIMER);
}
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1285,9 +1285,7 @@
// Force integer scales for resolution-independent rendering.
-#if SDL_VERSION_ATLEAST(2, 0, 5)
SDL_RenderSetIntegerScale(renderer, integer_scaling);
-#endif
// Blank out the full screen area in case there is any junk in
// the borders that won't otherwise be overwritten.