Add graphic options and game options to editor settings

This is a small quality-of-life tweak that makes it so if you're in the
middle of editing a level, you don't have to save the level, exit to the
menu, change whatever setting you wanted, re-enter the editor, and type
in the level name, just to change one setting. This is the same as
adding Graphic Options and Game Options to the in-game pause menu,
except for the editor, too.

To do this, I'm reusing Game::returntopausemenu() (because all of its
callers are the same callers for returning to editor settings) and
renamed it to returntoingame(), then added a variable named
ingame_editormode to Game. When we're in the options menus but still in
the editor, BOTH ingame_titlemode and ingame_editormode will be true.
This commit is contained in:
Misa
2021-03-18 19:52:30 -07:00
committed by Ethan Lee
parent fc8c7d034d
commit 2c8d338e47
4 changed files with 49 additions and 10 deletions

View File

@@ -455,7 +455,7 @@ static void menuactionpress(void)
music.playef(11);
if (game.ingame_titlemode)
{
game.returntopausemenu();
game.returntoingame();
}
else
{
@@ -766,7 +766,7 @@ static void menuactionpress(void)
music.playef(11);
if (game.ingame_titlemode)
{
game.returntopausemenu();
game.returntoingame();
}
else
{
@@ -1634,7 +1634,7 @@ void titleinput(void)
&& (game.currentmenuname == Menu::options
|| game.currentmenuname == Menu::graphicoptions))
{
game.returntopausemenu();
game.returntoingame();
}
else
{