diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index bae820a2..d7a3cfbf 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -242,7 +242,6 @@ public: bool startscript; std::string newscript; - int mainmenu; bool menustart; //Teleporting diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index b06fa62a..b80cb8ea 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -190,10 +190,11 @@ static void toggleflipmode(void) static bool fadetomode = false; static int fadetomodedelay = 0; +static int gotomode = 0; static void startmode(const int mode) { - game.mainmenu = mode; + gotomode = mode; graphics.fademode = 2; /* fading out */ fadetomode = true; fadetomodedelay = 16; @@ -1668,7 +1669,7 @@ void titleinput(void) else { fadetomode = false; - script.startgamemode(game.mainmenu); + script.startgamemode(gotomode); } } } diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index 0f8036b0..9825894d 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -505,7 +505,6 @@ int main(int argc, char *argv[]) game.gamestate = PRELOADER; game.menustart = false; - game.mainmenu = 0; // Initialize title screen to cyan graphics.titlebg.colstate = 10;