From 611da0d65de78b1e06b9d866115d86fe031915a0 Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Sat, 18 Mar 2023 21:35:27 +0100 Subject: [PATCH] Change more default settings - Show item counter on automap - Enable textured automap - HUD border scaling factor to better match default status bar scaling - Enable subtitles - Set render quality to "quality" to fix level mesh seams (gl_seamless) - Enable the first crosshair, and set its scale slightly smaller - Grow crosshair when picking up items - Show nametags when switching items and weapons - Always run enabled - Disable save/load confirmation dialog - Enable quicksave rotation - Enable additively-translucent Doom rocket explosion - Increase default particles to 10k, and increase the slider to 65k (engine limit) - Disable night vision effect The following changes from the original commit were not taken: - Enable thicker automap lines and anti-aliased lines for better visibility with high res displays - Enable mouse in menus by default (instead of touchscreen-like) - Don't show ENDDOOM when quitting the app - Set autoaim slider to 0 - Set sprite clipping to "Always" as this looks better than having sprites sink into the geometry - Set particle style to round as it matches the pixelated aesthetics better --- src/am_map.cpp | 4 ++-- src/common/2d/v_2ddrawer.cpp | 2 +- src/common/cutscenes/screenjob.cpp | 2 +- src/common/rendering/hwrenderer/data/hw_cvars.cpp | 2 +- src/common/statusbar/base_sbar.cpp | 2 +- src/g_cvars.cpp | 4 ++-- src/g_game.cpp | 8 ++++---- src/g_statusbar/shared_sbar.cpp | 2 +- src/playsim/p_mobj.cpp | 2 +- src/rendering/hwrenderer/scene/hw_lighting.cpp | 2 +- wadsrc/static/menudef.txt | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/am_map.cpp b/src/am_map.cpp index 8510eafa19..19fdb48379 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -130,7 +130,7 @@ struct islope_t // //============================================================================= -CVAR(Bool, am_textured, false, CVAR_ARCHIVE) +CVAR(Bool, am_textured, true, CVAR_ARCHIVE) CVAR(Float, am_linealpha, 1.0f, CVAR_ARCHIVE) CVAR(Int, am_linethickness, 1, CVAR_ARCHIVE) CVAR(Int, am_lineantialiasing, 0, CVAR_ARCHIVE) @@ -159,7 +159,7 @@ CVAR(Int, am_rotate, 0, CVAR_ARCHIVE); CVAR(Int, am_overlay, 0, CVAR_ARCHIVE); CVAR(Bool, am_showsecrets, true, CVAR_ARCHIVE); CVAR(Bool, am_showmonsters, true, CVAR_ARCHIVE); -CVAR(Bool, am_showitems, false, CVAR_ARCHIVE); +CVAR(Bool, am_showitems, true, CVAR_ARCHIVE); CVAR(Bool, am_showtime, true, CVAR_ARCHIVE); CVAR(Bool, am_showtotaltime, false, CVAR_ARCHIVE); CVAR(Int, am_colorset, 0, CVAR_ARCHIVE); diff --git a/src/common/2d/v_2ddrawer.cpp b/src/common/2d/v_2ddrawer.cpp index d6cf06af04..b700ee7bcb 100644 --- a/src/common/2d/v_2ddrawer.cpp +++ b/src/common/2d/v_2ddrawer.cpp @@ -47,7 +47,7 @@ static F2DDrawer drawer = F2DDrawer(); F2DDrawer* twod = &drawer; EXTERN_CVAR(Float, transsouls) -CVAR(Float, classic_scaling_factor, 1.0, CVAR_ARCHIVE) +CVAR(Float, classic_scaling_factor, 2.0, CVAR_ARCHIVE) CVAR(Float, classic_scaling_pixelaspect, 1.2f, CVAR_ARCHIVE) IMPLEMENT_CLASS(FCanvas, false, false) diff --git a/src/common/cutscenes/screenjob.cpp b/src/common/cutscenes/screenjob.cpp index c227459566..00afee804f 100644 --- a/src/common/cutscenes/screenjob.cpp +++ b/src/common/cutscenes/screenjob.cpp @@ -52,7 +52,7 @@ #include "m_argv.h" #include "i_interface.h" -CVAR(Bool, inter_subtitles, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); +CVAR(Bool, inter_subtitles, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CutsceneState cutscene; static int ticks; diff --git a/src/common/rendering/hwrenderer/data/hw_cvars.cpp b/src/common/rendering/hwrenderer/data/hw_cvars.cpp index a7967b92e3..18c5b5662e 100644 --- a/src/common/rendering/hwrenderer/data/hw_cvars.cpp +++ b/src/common/rendering/hwrenderer/data/hw_cvars.cpp @@ -56,7 +56,7 @@ CUSTOM_CVAR(Int, gl_fogmode, 2, CVAR_ARCHIVE | CVAR_NOINITCALL) CVAR(Bool, gl_portals, true, 0) CVAR(Bool,gl_mirrors,true,0) // This is for debugging only! CVAR(Bool,gl_mirror_envmap, true, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) -CVAR(Bool, gl_seamless, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) +CVAR(Bool, gl_seamless, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CUSTOM_CVAR(Int, r_mirror_recursions,4,CVAR_GLOBALCONFIG|CVAR_ARCHIVE) { diff --git a/src/common/statusbar/base_sbar.cpp b/src/common/statusbar/base_sbar.cpp index d7908233c4..95719632bb 100644 --- a/src/common/statusbar/base_sbar.cpp +++ b/src/common/statusbar/base_sbar.cpp @@ -59,7 +59,7 @@ IMPLEMENT_CLASS(DHUDFont, false, false); CVAR(Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE); CVAR(Int, crosshairhealth, 2, CVAR_ARCHIVE); -CVARD(Float, crosshairscale, 0.5, CVAR_ARCHIVE, "changes the size of the crosshair"); +CVARD(Float, crosshairscale, 0.3f, CVAR_ARCHIVE, "changes the size of the crosshair"); CVAR(Bool, crosshairgrow, false, CVAR_ARCHIVE); CUSTOM_CVARD(Float, hud_scalefactor, 1.f, CVAR_ARCHIVE, "changes the hud scale") diff --git a/src/g_cvars.cpp b/src/g_cvars.cpp index 14c8325685..513fce03bb 100644 --- a/src/g_cvars.cpp +++ b/src/g_cvars.cpp @@ -122,10 +122,10 @@ CUSTOM_CVAR (Int, cl_maxdecals, 1024, CVAR_ARCHIVE|CVAR_NOINITCALL) // [BC] Allow the maximum number of particles to be specified by a cvar (so people // with lots of nice hardware can have lots of particles!). -CUSTOM_CVAR(Int, r_maxparticles, 4000, CVAR_ARCHIVE | CVAR_NOINITCALL) +CUSTOM_CVAR(Int, r_maxparticles, 10000, CVAR_ARCHIVE | CVAR_NOINITCALL) { if (self == 0) - self = 4000; + self = 10000; else if (self > 65535) self = 65535; else if (self < 100) diff --git a/src/g_game.cpp b/src/g_game.cpp index f68fca2257..424f2dfe73 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -131,7 +131,7 @@ EXTERN_CVAR (Float, con_midtime); // //========================================================================== -CUSTOM_CVAR (Int, displaynametags, 0, CVAR_ARCHIVE) +CUSTOM_CVAR (Int, displaynametags, 3, CVAR_ARCHIVE) { if (self < 0 || self > 3) { @@ -201,7 +201,7 @@ int lookspeed[2] = {450, 512}; #define SLOWTURNTICS 6 -CVAR (Bool, cl_run, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always run? +CVAR (Bool, cl_run, true, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always run? CVAR (Bool, freelook, true, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always mlook? CVAR (Bool, lookstrafe, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always strafe with mouse? CVAR (Float, m_forward, 1.f, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) @@ -2180,7 +2180,7 @@ CCMD(opensaves) CVAR (Int, autosavenum, 0, CVAR_NOSET|CVAR_ARCHIVE|CVAR_GLOBALCONFIG) static int nextautosave = -1; CVAR (Int, disableautosave, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) -CVAR (Bool, saveloadconfirmation, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // [mxd] +CVAR (Bool, saveloadconfirmation, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // [mxd] CUSTOM_CVAR (Int, autosavecount, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) { if (self < 0) @@ -2188,7 +2188,7 @@ CUSTOM_CVAR (Int, autosavecount, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) } CVAR (Int, quicksavenum, -1, CVAR_NOSET|CVAR_ARCHIVE|CVAR_GLOBALCONFIG) static int lastquicksave = -1; -CVAR (Bool, quicksaverotation, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) +CVAR (Bool, quicksaverotation, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CUSTOM_CVAR (Int, quicksaverotationcount, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) { if (self < 1) diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index 55d18333b0..01a67a12a8 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/src/g_statusbar/shared_sbar.cpp @@ -122,7 +122,7 @@ EXTERN_CVAR(Float, hud_scalefactor) EXTERN_CVAR(Bool, hud_aspectscale) CVAR (Bool, crosshairon, true, CVAR_ARCHIVE); -CVAR (Int, crosshair, 0, CVAR_ARCHIVE) +CVAR (Int, crosshair, 1, CVAR_ARCHIVE) CVAR (Bool, crosshairforce, false, CVAR_ARCHIVE) CUSTOM_CVAR(Int, am_showmaplabel, 2, CVAR_ARCHIVE) { diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp index bc0b85961e..fa4d4df333 100644 --- a/src/playsim/p_mobj.cpp +++ b/src/playsim/p_mobj.cpp @@ -153,7 +153,7 @@ CUSTOM_CVAR (Float, sv_gravity, 800.f, CVAR_SERVERINFO|CVAR_NOSAVE|CVAR_NOINITCA } CVAR (Bool, cl_missiledecals, true, CVAR_ARCHIVE) -CVAR (Bool, addrocketexplosion, false, CVAR_ARCHIVE) +CVAR (Bool, addrocketexplosion, true, CVAR_ARCHIVE) CVAR (Int, cl_pufftype, 0, CVAR_ARCHIVE); CVAR (Int, cl_bloodtype, 0, CVAR_ARCHIVE); diff --git a/src/rendering/hwrenderer/scene/hw_lighting.cpp b/src/rendering/hwrenderer/scene/hw_lighting.cpp index ca8fa546dd..89354439e8 100644 --- a/src/rendering/hwrenderer/scene/hw_lighting.cpp +++ b/src/rendering/hwrenderer/scene/hw_lighting.cpp @@ -35,7 +35,7 @@ static float distfogtable[2][256]; // light to fog conversion table for black fog CVAR(Int, gl_weaponlight, 8, CVAR_ARCHIVE); -CVAR(Bool, gl_enhanced_nightvision, true, CVAR_ARCHIVE|CVAR_NOINITCALL) +CVAR(Bool, gl_enhanced_nightvision, false, CVAR_ARCHIVE|CVAR_NOINITCALL) //========================================================================== // diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index fd9e8185a3..5a62a9bbde 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -945,7 +945,7 @@ OptionMenu "VideoOptions" protected Option "$DSPLYMNU_ROCKETTRAILS", "cl_rockettrails", "RocketTrailTypes" Option "$DSPLYMNU_BLOODTYPE", "cl_bloodtype", "BloodTypes" Option "$DSPLYMNU_PUFFTYPE", "cl_pufftype", "PuffTypes" - Slider "$DSPLYMNU_MAXPARTICLES", "r_maxparticles", 100, 10000, 100, 0 + Slider "$DSPLYMNU_MAXPARTICLES", "r_maxparticles", 100, 65535, 100, 0 Slider "$DSPLYMNU_MAXDECALS", "cl_maxdecals", 0, 10000, 100, 0 Option "$DSPLYMNU_PLAYERSPRITES", "r_drawplayersprites", "OnOff" Option "$DSPLYMNU_DEATHCAM", "r_deathcamera", "OnOff"