AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't save -nouncapped/-uncapped to config, disable menu item (#1128)

Browse Source 
* don't save `-nouncapped`/`-uncapped` to config, disable menu item

* remove -hires/-nohires, run docgen -a
This commit is contained in:
Roman Fomin 2023-07-04 17:40:11 +07:00 committed by GitHub
parent bdb3f387db
commit 7bbc40800c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/i_video.c
View File

@ -48,7 +48,7 @@ int WIDESCREENDELTA; // [crispy] horizontal widescreen offset
boolean use_vsync; // killough 2/8/98: controls whether vsync is called
boolean hires, default_hires; // killough 11/98
boolean use_aspect;
boolean uncapped; // [FG] uncapped rendering frame rate
boolean uncapped, default_uncapped; // [FG] uncapped rendering frame rate
int fpslimit; // when uncapped, limit framerate to this value
boolean fullscreen;
boolean exclusive_fullscreen;
@ -1177,24 +1177,7 @@ static void I_InitVideoParms(void)
I_ResetInvalidDisplayIndex();
hires = default_hires;
//!
// @category video
//
// Enables 640x400 resolution for internal video buffer.
//
if (M_CheckParm("-hires"))
hires = true;
//!
// @category video
//
// Enables original 320x200 resolution for internal video buffer.
//
else if (M_CheckParm("-nohires"))
hires = false;
uncapped = default_uncapped;
//!
// @category video

2
src/i_video.h
View File

@ -66,7 +66,7 @@ extern boolean disk_icon; // killough 10/98
extern boolean hires, default_hires; // killough 11/98
extern boolean use_aspect;
extern boolean uncapped; // [FG] uncapped rendering frame rate
extern boolean uncapped, default_uncapped; // [FG] uncapped rendering frame rate
extern boolean fullscreen;
extern boolean exclusive_fullscreen;

16
src/m_menu.c
View File

@ -3932,14 +3932,7 @@ static void M_SetMidiPlayer(void)
static void M_EnableDisableFPSLimit(void)
{
if (!uncapped)
{
gen_settings1[gen1_fpslimit].m_flags |= S_DISABLE;
}
else
{
gen_settings1[gen1_fpslimit].m_flags &= ~S_DISABLE;
}
DISABLE_ITEM(!uncapped, gen_settings1[gen1_fpslimit]);
}
static void M_ToggleFullScreen(void)
@ -7225,6 +7218,11 @@ void M_ResetSetupMenu(void)
gen_settings3[gen3_pistolstart].m_flags |= S_DISABLE;
}
if (M_ParmExists("-uncapped") || M_ParmExists("-nouncapped"))
{
gen_settings1[gen1_uncapped].m_flags |= S_DISABLE;
}
if (deh_set_blood_color)
{
enem_settings1[enem1_colored_blood].m_flags |= S_DISABLE;
@ -7238,7 +7236,6 @@ void M_ResetSetupMenu(void)
DISABLE_ITEM(!comp[comp_vile], enem_settings1[enem1_ghost]);
M_CoerceFPSLimit();
M_EnableDisableFPSLimit();
M_UpdateCrosshairItems();
M_UpdateCenteredWeaponItem();
M_UpdateMultiLineMsgItem();
@ -7248,6 +7245,7 @@ void M_ResetSetupMenu(void)
void M_ResetSetupMenuVideo(void)
{
DISABLE_ITEM(!hires, enem_settings1[enem1_fuzz]);
M_EnableDisableFPSLimit();
}
//

2
src/m_misc.c
View File

@ -172,7 +172,7 @@ default_t defaults[] = {
// [FG] uncapped rendering frame rate
{
"uncapped",
(config_t *) &uncapped, NULL,
(config_t *) &default_uncapped, (config_t *) &uncapped,
{1}, {0, 1}, number, ss_gen, wad_no,
"1 to enable uncapped rendering frame rate"
},

8
src/params.h
View File

@ -17,16 +17,17 @@ static const char *params[] = {
"-2",
"-3",
"-fullscreen",
"-hires",
"-noblit",
"-nodraw",
"-nograbmouse",
"-nohires",
"-nouncapped",
"-uncapped",
"-window",
"-altdeath",
"-autojoin",
"-avg",
"-deathmatch",
"-dedicated",
"-dm3",
"-left",
"-oldsync",
@ -47,9 +48,6 @@ static const char *params[] = {
"-strict",
"-cdrom",
"-nogui",
"-dedicated",
"-uncapped",
"-nouncapped",
};
static const char *params_with_args[] = {