From 637a9d566521f2266ea2828d56bda8e79fb70ac6 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 16 Apr 2020 20:09:22 -0700 Subject: [PATCH] Remove now-unused variable Game::previousmenuname This used to be used for Menu::youwannaquit, but now it uses the same stack frame system as everything else, so it's gone unused now. --- desktop_version/src/Game.h | 2 +- desktop_version/src/Input.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index dd06d97b..0e23dd8e 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -227,7 +227,7 @@ public: //Main Menu Variables std::vector menuoptions; int currentmenuoption ; - enum Menu::MenuName currentmenuname, previousmenuname; + enum Menu::MenuName currentmenuname; int current_credits_list_index; int menuxoff, menuyoff; std::vector menustack; diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 7fb52170..73ab482b 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1284,7 +1284,6 @@ void titleinput() if (key.isDown(27) && game.currentmenuname != Menu::youwannaquit && game.menustart) { music.playef(11); - game.previousmenuname = game.currentmenuname; game.createmenu(Menu::youwannaquit); map.nexttowercolour(); }