From b5f1cbb2d120fdba5087a8066c273b989a591725 Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 9 Apr 2021 08:57:00 -0700 Subject: [PATCH] Clean up unused vars/funcs from eee98b0e071507a80e9ceec55eb29ca87a102319 eee98b0e071507a80e9ceec55eb29ca87a102319 made some functions and variables unused, which generate compiler warnings. So I've removed them. --- desktop_version/src/Input.cpp | 18 ------------------ desktop_version/src/Render.cpp | 16 ---------------- desktop_version/src/editor.cpp | 5 ----- 3 files changed, 39 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 47dbb12f..d6f2ae0a 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -749,23 +749,6 @@ static void menuactionpress(void) break; } case Menu::options: - { -#if defined(MAKEANDPLAY) - int flipmode_offset = 0; -#else - int flipmode_offset = game.ingame_titlemode && game.unlock[18] ? 0 : -1; -#endif - -#if defined(MAKEANDPLAY) - int unlockmode_offset = -1; -#else - int unlockmode_offset = 0; -#endif - - int mmmmmm_offset = music.mmmmmm ? 0 : -1; - - int offset = 0; - switch (game.currentmenuoption) { case 0: @@ -822,7 +805,6 @@ static void menuactionpress(void) } break; - } case Menu::unlockmenutrials: switch (game.currentmenuoption) { diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 510b3225..23132625 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -164,21 +164,6 @@ static void menurender(void) break; } case Menu::options: - { -#if defined(MAKEANDPLAY) - int flipmode_offset = 0; -#else - int flipmode_offset = game.ingame_titlemode && game.unlock[18] ? 0 : -1; -#endif - -#if defined(MAKEANDPLAY) - int unlockmode_offset = -1; -#else - int unlockmode_offset = 0; -#endif - - int offset = 0; - switch (game.currentmenuoption) { case 0: @@ -213,7 +198,6 @@ static void menurender(void) } } break; - } case Menu::graphicoptions: switch (game.currentmenuoption) { diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index c0608039..203536c7 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -3783,11 +3783,6 @@ void editorlogic(void) } } -static void creategraphicoptions(void) -{ - game.createmenu(Menu::graphicoptions); -} - static void creategameoptions(void) { game.createmenu(Menu::options);