From 3afd3aab8f0a4a0c033d69f5e653a27dd4e29f3c Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 27 Jul 2024 15:02:47 +0200 Subject: [PATCH] lagless cam toggle --- src/d_main.c | 2 +- src/d_netcmd.c | 5 +++++ src/d_netcmd.h | 2 ++ src/m_menu.c | 52 +++++++++++++++++++++++++++----------------------- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 2e507c87a..3f8fd1c68 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -740,7 +740,7 @@ void D_SRB2Loop(void) else if (rendertimeout < entertic) // in case the server hang or netsplit { // Lagless camera! Yay! - if (gamestate == GS_LEVEL && netgame) + if (cv_laglesscam.value && gamestate == GS_LEVEL && netgame) { // Evaluate the chase cam once for every local realtic // This might actually be better suited inside G_Ticker or TryRunTics diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 52dcfba45..c5156929d 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -299,6 +299,9 @@ consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, //WTF consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +// Lagless camera! Yay! +consvar_t cv_laglesscam = {"laglesscamera", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + #if defined(HAVE_SDL) || defined(_WINDOWS) //joystick 1 and 2 consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick, 0, NULL, NULL, 0, 0, NULL}; @@ -1167,6 +1170,8 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_betainterscreen); + CV_RegisterVar(&cv_laglesscam); + // ingame object placing COM_AddCommand("objectplace", Command_ObjectPlace_f); COM_AddCommand("writethings", Command_Writethings_f); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index ad4789313..dbb06409d 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -209,6 +209,8 @@ extern consvar_t cv_showspecstuff; extern consvar_t cv_betainterscreen; +extern consvar_t cv_laglesscam; + typedef enum { SKINMENUTYPE_SCROLL = 0, diff --git a/src/m_menu.c b/src/m_menu.c index 8128c564d..7af240a60 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2014,38 +2014,40 @@ static menuitem_t OP_SaturnMenu[] = { {IT_HEADER, NULL, "Saturn Options", NULL, 0}, - {IT_STRING | IT_CVAR, NULL, "Serverqueue waittime", &cv_connectawaittime, 10}, + {IT_STRING | IT_CVAR, NULL, "Serverqueue waittime", &cv_connectawaittime, 10}, - {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 20}, - {IT_STRING | IT_CVAR, NULL, "Input Display outside of RA", &cv_showinput, 25}, - {IT_STRING | IT_CVAR, NULL, "Speedometer Style", &cv_newspeedometer, 30}, - {IT_STRING | IT_CVAR, NULL, "Stat Display", &cv_showstats, 35}, - {IT_STRING | IT_CVAR, NULL, "Show Lap Times", &cv_showlaptimes, 40}, - {IT_STRING | IT_CVAR, NULL, "Higher Resolution Portraits", &cv_highresportrait, 45}, - {IT_STRING | IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 50}, - {IT_STRING | IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 55}, - {IT_STRING | IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 60}, - {IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 65}, - {IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 70}, - {IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 75}, + {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 20}, + {IT_STRING | IT_CVAR, NULL, "Input Display outside of RA", &cv_showinput, 25}, + {IT_STRING | IT_CVAR, NULL, "Speedometer Style", &cv_newspeedometer, 30}, + {IT_STRING | IT_CVAR, NULL, "Stat Display", &cv_showstats, 35}, + {IT_STRING | IT_CVAR, NULL, "Show Lap Times", &cv_showlaptimes, 40}, + {IT_STRING | IT_CVAR, NULL, "Higher Resolution Portraits", &cv_highresportrait, 45}, + {IT_STRING | IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 50}, + {IT_STRING | IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 55}, + {IT_STRING | IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 60}, + {IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 65}, + {IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 70}, + {IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 75}, - {IT_STRING | IT_CVAR, NULL, "Uncapped HUD", &cv_uncappedhud, 85}, + {IT_STRING | IT_CVAR, NULL, "Lagless Camera", &cv_laglesscam, 85}, - {IT_STRING | IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 90}, - {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 95}, - {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 100}, + {IT_STRING | IT_CVAR, NULL, "Uncapped HUD", &cv_uncappedhud, 95}, - {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 110}, + {IT_STRING | IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 100}, + {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 105}, + {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 110}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 120}, + {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 120}, - {IT_STRING | IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 130}, - {IT_STRING | IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 135}, + {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 130}, - {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 145}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 150}, + {IT_STRING | IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 140}, + {IT_STRING | IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 145}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 160}, // uwu + {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 155}, + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 160}, + + {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 170}, // uwu }; static const char* OP_SaturnTooltips[] = @@ -2064,6 +2066,7 @@ static const char* OP_SaturnTooltips[] = "Show the big 'LAP' text on a lap change.", "Show player names on the minimap.", "Minimize the player icons on the minimap.", + "Makes the Camera Lagless in netgames.", "Uncaps the HUD framerate, making it appear smoother.", "Show the big Cecho Messages.", "Show Localskin Menus.", @@ -2093,6 +2096,7 @@ enum sm_lapemblem, sm_mapnames, sm_smallmap, + sm_laglesscam, sm_uncappedhud, sm_cechotogle, sm_showlocalskin,