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

Using "-strict" always disables related menu items (#1581)

Browse Source 
Similar to what "-complevel" does.
This commit is contained in:
ceski 2024-03-10 23:34:56 -07:00 committed by GitHub
parent a21559ea95
commit bad8957df8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/doomstat.h
View File

@ -319,6 +319,7 @@ extern int playback_skiptics;
extern boolean frozen_mode; extern boolean frozen_mode;
extern boolean strictmode, default_strictmode; extern boolean strictmode, default_strictmode;
extern boolean force_strictmode;
#define STRICTMODE(x) (strictmode ? 0 : (x)) #define STRICTMODE(x) (strictmode ? 0 : (x))

4
src/g_game.c
View File

@ -159,6 +159,7 @@ boolean force_complevel;
boolean pistolstart, default_pistolstart; boolean pistolstart, default_pistolstart;
boolean strictmode, default_strictmode; boolean strictmode, default_strictmode;
boolean force_strictmode;
boolean critical; boolean critical;
// [crispy] store last cmd to track joins // [crispy] store last cmd to track joins
@ -3436,7 +3437,10 @@ void G_ReloadDefaults(boolean keep_demover)
// //
if (M_CheckParm("-strict")) if (M_CheckParm("-strict"))
{
strictmode = true; strictmode = true;
force_strictmode = true;
}
G_UpdateSideMove(); G_UpdateSideMove();
P_UpdateDirectVerticalAiming(); P_UpdateDirectVerticalAiming();

5
src/mn_setup.c
View File

@ -318,7 +318,8 @@ static const char **GetStrings(int id);
static boolean ItemDisabled(int flags) static boolean ItemDisabled(int flags)
{ {
if ((flags & S_DISABLE) || (flags & S_STRICT && default_strictmode) if ((flags & S_DISABLE)
|| (flags & S_STRICT && (default_strictmode || force_strictmode))
|| (flags & S_BOOM && default_complevel < CL_BOOM) || (flags & S_BOOM && default_complevel < CL_BOOM)
|| (flags & S_MBF && default_complevel < CL_MBF) || (flags & S_MBF && default_complevel < CL_MBF)
|| (flags & S_VANILLA && default_complevel != CL_VANILLA)) || (flags & S_VANILLA && default_complevel != CL_VANILLA))
@ -3777,7 +3778,7 @@ void MN_SetupResetMenu(void)
{ {
extern boolean deh_set_blood_color; extern boolean deh_set_blood_color;
DisableItem(M_ParmExists("-strict"), comp_settings1, "strictmode"); DisableItem(force_strictmode, comp_settings1, "strictmode");
DisableItem(force_complevel, comp_settings1, "default_complevel"); DisableItem(force_complevel, comp_settings1, "default_complevel");
DisableItem(M_ParmExists("-pistolstart"), comp_settings1, "pistolstart"); DisableItem(M_ParmExists("-pistolstart"), comp_settings1, "pistolstart");
DisableItem(M_ParmExists("-uncapped") || M_ParmExists("-nouncapped"), DisableItem(M_ParmExists("-uncapped") || M_ParmExists("-nouncapped"),