Give screenshots taken in menu more descriptive filenames

Author: bradharding

releasenotes.md

@@ -22,7 +22,7 @@
   * Both zooming and panning, using the keyboard, mouse or controller, are now smoother.
 * A bug is fixed whereby if the <kbd><b>ENTER</b></kbd> key was bound to an action using the `bind` CCMD, when pressed it would also still show the previous player message.
 * A bug is fixed whereby strings of commands bound to mouse buttons using the `bind` CCMD wouldn’t always execute.
-* Screenshots taken when the palette displayed by the `palette` CCMD is shown are now saved as `Palette.png`.
+* Screenshots taken while a menu is open or the `palette` CCMD is in use now have more descriptive filenames.
 * Texture offsets are now corrected in certain maps built with [*ZDBSP*](https://zdoom.org/wiki/ZDBSP) extended nodes.
 * A bug is fixed whereby the `con_timestampformat`, `english`, `r_detail` and `units` CVARs couldn’t be changed in the console. These CVARs also weren’t being reset when vanilla mode was enabled.
 * The `playername` CVAR can now be changed back to its default of `“”` in the console.

src/m_menu.c

@@ -114,7 +114,7 @@ static int      blurtic = -1;
 static int      functionkey;
 
 // current menudef
-static menu_t   *currentmenu;
+menu_t          *currentmenu;
 
 int             menuspindirection;
 int             menuspinspeed;
@@ -342,7 +342,7 @@ static menuitem_t OptionsMenu[] =
     {  1, "M_CONSOL", &M_Console,           &s_M_CONSOLE          }
 };
 
-static menu_t OptionsDef =
+menu_t OptionsDef =
 {
     opt_end,
     &MainDef,
@@ -405,7 +405,7 @@ static menuitem_t SoundMenu[] =
     { -1, "",         NULL,        NULL             }
 };
 
-static menu_t SoundDef =
+menu_t SoundDef =
 {
     sound_end,
     &OptionsDef,

src/m_menu.h

@@ -121,6 +121,7 @@ extern bool     helpscreen;
 extern bool     palettescreen;
 extern bool     quitting;
 extern bool     reopenautomap;
+extern menu_t   *currentmenu;
 extern int      menuspindirection;
 extern int      menuspinspeed;
 extern int      quicksaveslot;
@@ -130,7 +131,9 @@ extern menu_t   ExpDef;
 extern menu_t   LoadDef;
 extern menu_t   MainDef;
 extern menu_t   NewDef;
+extern menu_t   OptionsDef;
 extern menu_t   SaveDef;
+extern menu_t   SoundDef;
 extern bool     customepisodes;
 extern uint64_t controllerwait;
 extern uint64_t mousewait;

src/v_video.c

@@ -2033,7 +2033,24 @@ bool V_ScreenShot(void)
     else if (helpscreen)
         M_StringCopy(mapname, "Help", sizeof(mapname));
     else if (menuactive)
-        M_StringCopy(mapname, "Menu", sizeof(mapname));
+    {
+        if (currentmenu == &MainDef)
+            M_StringCopy(mapname, "Main Menu", sizeof(mapname));
+        else if (currentmenu == &EpiDef)
+            M_StringCopy(mapname, "Episode Menu", sizeof(mapname));
+        else if (currentmenu == &ExpDef)
+            M_StringCopy(mapname, "Expansion Menu", sizeof(mapname));
+        else if (currentmenu == &NewDef)
+            M_StringCopy(mapname, "Skill Level Menu", sizeof(mapname));
+        else if (currentmenu == &LoadDef)
+            M_StringCopy(mapname, "Load Game Menu", sizeof(mapname));
+        else if (currentmenu == &SaveDef)
+            M_StringCopy(mapname, "Save Game Menu", sizeof(mapname));
+        else if (currentmenu == &OptionsDef)
+            M_StringCopy(mapname, "Options Menu", sizeof(mapname));
+        else if (currentmenu == &SoundDef)
+            M_StringCopy(mapname, "Sound Volume Menu", sizeof(mapname));
+    }
     else if (automapactive)
         M_StringCopy(mapname, "Automap", sizeof(mapname));
     else if (paused)