From 470a4358efd4a7861d0654ef00f4d002844a8a4b Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 11 Nov 2021 23:54:00 -0800 Subject: [PATCH] Remove VSync toggle ifdefs These ifdefs can go away now that our minimum SDL version is 2.0.20. --- desktop_version/src/Input.cpp | 3 --- desktop_version/src/Render.cpp | 6 ------ 2 files changed, 9 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 0cce6eab..43cb122d 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -662,13 +662,10 @@ static void menuactionpress(void) if (game.currentmenuoption == offset + 5) { processed = true; - /* FIXME: Upgrade to SDL 2.0.18 and remove this ifdef when it releases! */ -#if SDL_VERSION_ATLEAST(2, 0, 17) //toggle vsync music.playef(11); gameScreen.toggleVSync(); game.savestatsandsettings_menu(); -#endif } if (!processed) { diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index a6fe6691..c3f568fd 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -370,13 +370,7 @@ static void menurender(void) if (game.currentmenuoption == offset + 5) { graphics.bigprint(-1, 30, "Toggle VSync", tr, tg, tb, true); - /* FIXME: Upgrade to SDL 2.0.18 and remove this ifdef when it releases! */ -#if SDL_VERSION_ATLEAST(2, 0, 17) graphics.Print(-1, 65, "Turn VSync on or off.", tr, tg, tb, true); -#else - graphics.Print(-1, 65, "Your SDL version is too old!", tr, tg, tb, true); - graphics.Print(-1, 75, "Edit the config file.", tr, tg, tb, true); -#endif if (!gameScreen.vsync) {