Skip to content

Commit

Permalink
move Exit Sequence to the Misc menu, remove Menu Backdrop (#1881)
Browse files Browse the repository at this point in the history 
* move Exit Sequence to the Misc menu

* remove Menu Backdrop from the menu

* remove Menu Backdrop remnants
  • Loading branch information
@fabiangreffrath
fabiangreffrath authored Sep 6, 2024
1 parent 6f1d7f1 commit e61b634
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions src/mn_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ enum
str_default_complevel,
str_exit_sequence,
str_death_use_action,
str_menu_backdrop,
str_widescreen,
str_bobbing_pct,
str_screen_melt,
Expand Down Expand Up @@ -2657,8 +2656,6 @@ static void SmoothLight(void)
setsizeneeded = true; // run R_ExecuteSetViewSize
}

static const char *menu_backdrop_strings[] = {"Off", "Dark", "Texture"};

static const char *exit_sequence_strings[] = {
"Off", "Sound Only", "PWAD ENDOOM", "On"
};
Expand Down Expand Up @@ -2692,14 +2689,6 @@ static setup_menu_t gen_settings5[] = {
{"Smooth Diminishing Lighting", S_ONOFF, OFF_CNTR_X, M_SPC, {"smoothlight"},
.action = SmoothLight},

MI_GAP,

{"Menu Backdrop", S_CHOICE, OFF_CNTR_X, M_SPC, {"menu_backdrop"},
.strings_id = str_menu_backdrop},

{"Exit Sequence", S_CHOICE, OFF_CNTR_X, M_SPC, {"exit_sequence"},
.strings_id = str_exit_sequence},

MI_END
};

Expand Down Expand Up @@ -2779,6 +2768,9 @@ static setup_menu_t gen_settings6[] = {
{"Default Skill", S_CHOICE | S_LEVWARN, OFF_CNTR_X, M_SPC,
{"default_skill"}, .strings_id = str_default_skill},

{"Exit Sequence", S_CHOICE, OFF_CNTR_X, M_SPC, {"exit_sequence"},
.strings_id = str_exit_sequence},

MI_END
};

Expand Down Expand Up @@ -4221,7 +4213,6 @@ static const char **selectstrings[] = {
default_complevel_strings,
exit_sequence_strings,
death_use_action_strings,
menu_backdrop_strings,
widescreen_strings,
bobbing_pct_strings,
screen_melt_strings,
Expand Down

4 comments on commit e61b634

@fabiangreffrath
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we move "Level Brightness" to the new empty space on the "Display" tab to unclutter the "Video" menu a bit?

@ceski-1
Copy link
Collaborator

@ceski-1 ceski-1 commented on e61b634 Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it makes more sense in the Video tab. If we want to save space, I still think "Fullscreen / Exclusive Fullscreen" and "Uncapped Framerate / Framerate Limit" should be combined somehow, there has to be some kind of solution. #1854

@rfomin
Copy link
Collaborator

@rfomin rfomin commented on e61b634 Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can rename "Level Brightness" to "Extra Brightness" like in KEX port:

image

If we want to save space, I still think "Fullscreen / Exclusive Fullscreen" and "Uncapped Framerate / Framerate Limit" should be combined somehow, there has to be some kind of solution.

The ideal would be to get rid of “Exclusive Fullscreen”, but that would have to wait for SDL3, right?

@ceski-1
Copy link
Collaborator

@ceski-1 ceski-1 commented on e61b634 Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can rename "Level Brightness" to "Extra Brightness" like in KEX port:

I like it.

The ideal would be to get rid of “Exclusive Fullscreen”, but that would have to wait for SDL3, right?

If D3D11 and Vulkan become the default in SDL3, then exclusive fullscreen won't be needed for most users. But if anyone is stuck with D3D9 or OpenGL then they'll still need it for less input latency.

Please sign in to comment.