stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-12 07:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore some functionality that went missing

Browse source
This commit is contained in:
Jaime Passos 2020-02-03 02:12:55 -03:00
parent 520e2148fe
commit af66a2e5fa
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/m_menu.c
View file

@ -320,6 +320,7 @@ menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef;
menu_t OP_ServerOptionsDef; menu_t OP_ServerOptionsDef;
menu_t OP_MonitorToggleDef; menu_t OP_MonitorToggleDef;
static void M_ScreenshotOptions(INT32 choice); static void M_ScreenshotOptions(INT32 choice);
static void M_SetupScreenshotMenu(void);
static void M_EraseData(INT32 choice); static void M_EraseData(INT32 choice);
static void M_Addons(INT32 choice); static void M_Addons(INT32 choice);
@ -358,7 +359,6 @@ static void M_DrawMonitorToggles(void);
static void M_OGL_DrawFogMenu(void); static void M_OGL_DrawFogMenu(void);
#endif #endif
#ifndef NONET #ifndef NONET
static void M_DrawScreenshotMenu(void);
static void M_DrawConnectMenu(void); static void M_DrawConnectMenu(void);
static void M_DrawMPMainMenu(void); static void M_DrawMPMainMenu(void);
static void M_DrawRoomMenu(void); static void M_DrawRoomMenu(void);
@ -1454,6 +1454,7 @@ static menuitem_t OP_ScreenshotOptionsMenu[] =
enum enum
{ {
op_screenshot_colorprofile = 1, op_screenshot_colorprofile = 1,
op_screenshot_storagelocation = 3,
op_screenshot_folder = 4, op_screenshot_folder = 4,
op_movie_folder = 11, op_movie_folder = 11,
op_screenshot_capture = 12, op_screenshot_capture = 12,
@ -3673,6 +3674,9 @@ void M_Ticker(void)
if (--vidm_testingmode == 0) if (--vidm_testingmode == 0)
setmodeneeded = vidm_previousmode + 1; setmodeneeded = vidm_previousmode + 1;
} }
if (currentMenu == &OP_ScreenshotOptionsDef)
M_SetupScreenshotMenu();
} }
// //
@ -11090,9 +11094,27 @@ static void M_ScreenshotOptions(INT32 choice)
Screenshot_option_Onchange(); Screenshot_option_Onchange();
Moviemode_mode_Onchange(); Moviemode_mode_Onchange();
M_SetupScreenshotMenu();
M_SetupNextMenu(&OP_ScreenshotOptionsDef); M_SetupNextMenu(&OP_ScreenshotOptionsDef);
} }
static void M_SetupScreenshotMenu(void)
{
menuitem_t *item = &OP_ScreenshotOptionsMenu[op_screenshot_colorprofile];
#ifdef HWRENDER
// Hide some options based on render mode
if (rendermode == render_opengl)
{
item->status = IT_GRAYEDOUT;
if ((currentMenu == &OP_ScreenshotOptionsDef) && (itemOn == op_screenshot_colorprofile)) // Can't select that
itemOn = op_screenshot_storagelocation;
}
else
#endif
item->status = (IT_STRING | IT_CVAR);
}
// ============= // =============
// JOYSTICK MENU // JOYSTICK MENU
// ============= // =============
@ -11953,6 +11975,15 @@ static void M_HandleVideoMode(INT32 ch)
static void M_DrawScreenshotMenu(void) static void M_DrawScreenshotMenu(void)
{ {
M_DrawGenericScrollMenu(); M_DrawGenericScrollMenu();
#ifdef HWRENDER
if ((rendermode == render_opengl) && (itemOn < 7)) // where it starts to go offscreen; change this number if you change the layout of the screenshot menu
{
INT32 y = currentMenu->y+currentMenu->menuitems[op_screenshot_colorprofile].alphaKey*2;
if (itemOn == 6)
y -= 10;
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, y, V_REDMAP, "Yes");
}
#endif
} }
// =============== // ===============