diff --git a/CHANGELOG.md b/CHANGELOG.md index e7eebb540..962445e9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Disabled Armor icon by default. - **Implemented Teleporter Zoom for multiplayer respawning** - **MDK Fist attacks now prioritize enemies over friends** +- **Current resolution is now reported by some video-related menu items** - **Disabled `input_spy` and `input_menu_reloadlevel` when typing in Chat** ## Bug Fixes diff --git a/src/m_menu.c b/src/m_menu.c index bbe6b4695..79ec96dff 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2674,6 +2674,19 @@ void M_DrawInstructions() strcpy(menu_buffer, s); M_DrawMenuString(x,20,color); } + + // [Nugget] Report current resolution + if (flags & S_RESOLUTION) + { + char str[48]; + + M_snprintf(str, sizeof(str), "Current Resolution: %ix%i", + (SCREENWIDTH << hires), + (use_aspect ? (6 * SCREENHEIGHT / 5) : SCREENHEIGHT) << hires); + + M_DrawString((ORIGWIDTH / 2) - (M_GetPixelWidth(str) / 2), + M_Y + (14 * M_SPC), CR_GOLD, str); + } } // [FG] reload current level / go to next level @@ -4317,10 +4330,13 @@ setup_menu_t gen_settings1[] = { // General Settings screen1 {"Video" ,S_SKIP|S_TITLE, m_null, M_X, M_Y}, - {"Renderer Resolution", S_CHOICE, m_null, M_X, M_Y+ gen1_hires*M_SPC, + // [Nugget] These first two items now report + // the current resolution when sitting on them + + {"Renderer Resolution", S_CHOICE|S_RESOLUTION, m_null, M_X, M_Y+ gen1_hires*M_SPC, {"hires"}, 0, M_ResetScreen, hires_strings}, - {"Widescreen Rendering", S_CHOICE, m_null, M_X, M_Y+ gen1_widescreen*M_SPC, + {"Widescreen Rendering", S_CHOICE|S_RESOLUTION, m_null, M_X, M_Y+ gen1_widescreen*M_SPC, {"widescreen"}, 0, M_ResetScreen, widescreen_ratios}, // [Nugget] Widescreen ratios {"", S_SKIP, m_null, M_X, M_Y + gen1_gap1*M_SPC}, diff --git a/src/m_menu.h b/src/m_menu.h index cd75ec0b5..1c0d1c4f7 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -114,6 +114,7 @@ extern int warning_about_changes, print_warning_about_changes; #define S_BOOM 0x10000000 // Disable if complevel < boom #define S_VANILLA 0x20000000 // Disable if complevel != vanilla #define S_CRITICAL 0x40000000 // Disable when recording/playing a demo and in netgame +#define S_RESOLUTION 0x80000000 // [Nugget] Report current resolution // S_SHOWDESC = the set of items whose description should be displayed // S_SHOWSET = the set of items whose setting should be displayed