thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename moviemode_mode cvar to lossless_recorder, remove WebM option, adjust menus

Browse source
This commit is contained in:
James R 2023-03-16 00:07:51 -07:00
parent efb86f709f
commit aef45fb005
6 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -895,7 +895,7 @@ void D_RegisterClientCommands(void)
COM_AddCommand("minigen", M_MinimapGenerate); COM_AddCommand("minigen", M_MinimapGenerate);
CV_RegisterVar(&cv_screenshot_colorprofile); CV_RegisterVar(&cv_screenshot_colorprofile);
CV_RegisterVar(&cv_moviemode); CV_RegisterVar(&cv_lossless_recorder);
#ifdef SRB2_CONFIG_ENABLE_WEBM_MOVIES #ifdef SRB2_CONFIG_ENABLE_WEBM_MOVIES
M_AVRecorder_AddCommands(); M_AVRecorder_AddCommands();
@ -2503,7 +2503,7 @@ static void Command_Stopdemo_f(void)
static void Command_StartMovie_f(void) static void Command_StartMovie_f(void)
{ {
M_StartMovie(cv_moviemode.value); M_StartMovie(cv_lossless_recorder.value);
} }
static void Command_StopMovie_f(void) static void Command_StopMovie_f(void)

2
src/k_menu.h
View file

@ -561,8 +561,6 @@ extern consvar_t cv_autorecord;
void M_SetMenuDelay(UINT8 i); void M_SetMenuDelay(UINT8 i);
void Moviemode_mode_Onchange(void);
void M_SortServerList(void); void M_SortServerList(void);
void M_MapMenuControls(event_t *ev); void M_MapMenuControls(event_t *ev);

6
src/m_misc.cpp
View file

@ -114,8 +114,8 @@ typedef off_t off64_t;
consvar_t cv_screenshot_colorprofile = CVAR_INIT ("screenshot_colorprofile", "Yes", CV_SAVE, CV_YesNo, NULL); consvar_t cv_screenshot_colorprofile = CVAR_INIT ("screenshot_colorprofile", "Yes", CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {MM_AVRECORDER, "WebM"}, {0, NULL}}; static CV_PossibleValue_t lossless_recorder_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
consvar_t cv_moviemode = CVAR_INIT ("moviemode_mode", "WebM", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange); consvar_t cv_lossless_recorder = CVAR_INIT ("lossless_recorder", "GIF", CV_SAVE, lossless_recorder_cons_t, NULL);
static CV_PossibleValue_t zlib_mem_level_t[] = { static CV_PossibleValue_t zlib_mem_level_t[] = {
{1, "(Min Memory) 1"}, {1, "(Min Memory) 1"},
@ -1866,7 +1866,7 @@ boolean M_ScreenshotResponder(event_t *ev)
} }
else else
{ {
M_StartMovie(static_cast<moviemode_t>(cv_moviemode.value)); M_StartMovie(static_cast<moviemode_t>(cv_lossless_recorder.value));
} }
break; break;

2
src/m_misc.h
View file

@ -43,7 +43,7 @@ typedef enum {
extern moviemode_t moviemode; extern moviemode_t moviemode;
extern consvar_t cv_screenshot_colorprofile; extern consvar_t cv_screenshot_colorprofile;
extern consvar_t cv_moviemode; extern consvar_t cv_lossless_recorder;
extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits; extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits;
extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa; extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa;
extern consvar_t cv_apng_delay, cv_apng_downscale; extern consvar_t cv_apng_delay, cv_apng_downscale;

3
src/menus/options-1.c
View file

@ -100,9 +100,6 @@ void M_InitOptions(INT32 choice)
// So that pause doesn't go to the main menu... // So that pause doesn't go to the main menu...
OPTIONS_MainDef.prevMenu = currentMenu; OPTIONS_MainDef.prevMenu = currentMenu;
// This will disable or enable the textboxes of the affected menus before we get to them.
Moviemode_mode_Onchange();
M_SetupNextMenu(&OPTIONS_MainDef, false); M_SetupNextMenu(&OPTIONS_MainDef, false);
} }

23
src/menus/options-data-screenshots.c
View file

@ -9,19 +9,23 @@
menuitem_t OPTIONS_DataScreenshot[] = menuitem_t OPTIONS_DataScreenshot[] =
{ {
#ifdef SRB2_CONFIG_ENABLE_WEBM_MOVIES
{IT_HEADER, "MOVIE RECORDING (F9)", NULL, {IT_HEADER, "MOVIE RECORDING (F9)", NULL,
NULL, {NULL}, 0, 0}, NULL, {NULL}, 0, 0},
{IT_STRING | IT_CVAR, "Recording Format", "What file format will movies will be recorded in?",
NULL, {.cvar = &cv_moviemode}, 0, 0},
#ifdef SRB2_CONFIG_ENABLE_WEBM_MOVIES
{IT_STRING | IT_CVAR, "Real-Time Data", "If enabled, shows fps, duration and filesize of recording in real-time.", {IT_STRING | IT_CVAR, "Real-Time Data", "If enabled, shows fps, duration and filesize of recording in real-time.",
NULL, {.cvar = &cv_movie_showfps}, 0, 0}, NULL, {.cvar = &cv_movie_showfps}, 0, 0},
#else #endif
{IT_SPACE | IT_NOTHING, NULL, NULL, {IT_SPACE | IT_NOTHING, NULL, NULL,
NULL, {NULL}, 0, 0}, NULL, {NULL}, 0, 0},
#endif
{IT_HEADER, "LOSSLESS RECORDING (F10)", NULL,
NULL, {NULL}, 0, 0},
{IT_STRING | IT_CVAR, "Recording Format", "What file format will lossless recordings use?",
NULL, {.cvar = &cv_lossless_recorder}, 0, 0},
}; };
menu_t OPTIONS_DataScreenshotDef = { menu_t OPTIONS_DataScreenshotDef = {
@ -39,10 +43,3 @@ menu_t OPTIONS_DataScreenshotDef = {
NULL, NULL,
NULL, NULL,
}; };
void Moviemode_mode_Onchange(void)
{
// opt 3 in a 0 based array, you get the idea...
OPTIONS_DataScreenshot[2].status =
(cv_moviemode.value == MM_AVRECORDER ? IT_CVAR|IT_STRING : IT_DISABLED);
}