From 050c2540182d8e7b3c29b2054782216e411d4531 Mon Sep 17 00:00:00 2001 From: sputnikutah Date: Tue, 26 Sep 2023 17:45:01 -0500 Subject: [PATCH 1/2] private address string for CCREQ_PLAYER_INFO response. Return "private" for player's ip address when one uses the test console command. --- Quake/net_wins.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Quake/net_wins.c b/Quake/net_wins.c index f939d023b..d4064d05d 100644 --- a/Quake/net_wins.c +++ b/Quake/net_wins.c @@ -508,8 +508,7 @@ const char *WINS_AddrToString (struct qsockaddr *addr, qboolean masked) haddr = ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr); if (masked) { - sprintf(buffer, "%d.%d.%d.0/24", (haddr >> 24) & 0xff, - (haddr >> 16) & 0xff, (haddr >> 8) & 0xff); + sprintf(buffer, "private"); } else { From aed745f1e9847c5a6ddecf8c8721e57ff8fbc7a7 Mon Sep 17 00:00:00 2001 From: sputnikutah Date: Thu, 8 Feb 2024 10:37:21 -0600 Subject: [PATCH 2/2] minor tweaks nothing to worry about. --- Quake/keys.c | 34 +++++++++++++++++++++++++++------- Quake/view.c | 6 ++++-- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/Quake/keys.c b/Quake/keys.c index 9471e70da..f9f080e13 100644 --- a/Quake/keys.c +++ b/Quake/keys.c @@ -766,7 +766,26 @@ void Key_Console (int key) Char_Console2(32); return; + case K_KP_INS: + if (keydown[K_CTRL]) + { + Cvar_SetValue("scr_conscale" , (glwidth / 640)); //R00k: hotkey to enlarge the interface after changing resolutions. + Cvar_SetValue("scr_menuscale", (glwidth / 640)); + Cvar_SetValue("scr_sbarscale", (glwidth / 640)); + } + break; + case K_TAB: + if ((key_lines[edit_line][1] == 'q')) // RAGE-QUIT AUTO SEQUENCE DETECTED + { + key_lines[edit_line][1] = 'q'; + key_lines[edit_line][2] = 'u'; + key_lines[edit_line][3] = 'i'; + key_lines[edit_line][4] = 't'; + key_lines[edit_line][5] = ';'; + key_linepos += 3; + return; + } Con_TabComplete (TABCOMPLETE_USER); // woods #iwtabcomplete return; @@ -958,9 +977,10 @@ void Key_Console (int key) case K_INS: if (keydown[K_SHIFT]) /* Shift-Ins paste */ PasteToConsole(); - else key_insert ^= 1; - Con_TabComplete (TABCOMPLETE_AUTOHINT); // woods #iwtabcomplete - return; + else + key_insert ^= 1; + Con_TabComplete(TABCOMPLETE_AUTOHINT); // woods #iwtabcomplete + break; case 'U': case 'u': @@ -1013,7 +1033,8 @@ void Key_Console (int key) break; case 'd': case 'D': - if (keydown[K_CTRL]) { /* Ctrl+d: abort the line -- S.A */ // woods switched to D, from C #concopy + if (keydown[K_CTRL]) + { /* Ctrl+d: abort the line -- S.A */ // woods switched to D, from C #concopy Con_Printf ("%s\n", workline); workline[0] = ']'; workline[1] = 0; @@ -1773,10 +1794,9 @@ void Key_EventWithKeycode (int key, qboolean down, int keycode) } } #endif - - if (cls.download.active) + if (down && (key == '.') && keydown[K_CTRL]) // woods #shortcuts #stopdownload { - if (down && (key == '.') && keydown[K_CTRL]) // woods #shortcuts #stopdownload + if (cls.download.active) { Cbuf_AddText("stopdownload\n"); return; diff --git a/Quake/view.c b/Quake/view.c index d0872f02b..9e3ddf9d8 100644 --- a/Quake/view.c +++ b/Quake/view.c @@ -890,8 +890,10 @@ void V_CalcRefdef (void) CalcGunAngle (); view->eflags = EFLAGS_VIEWMODEL; - VectorScale(forward, 1.0/32, view->origin); //bias it very slightly sideways (so it shifts slightly when turning to mimic the 1/32 bias that used to affect it before we changed how viewmodels work) - view->origin[0] = bob*0.4; //and bob it forwards + VectorScale(forward, 0.03125f, view->origin); //bias it very slightly sideways (so it shifts slightly when turning to mimic the 1/32 bias that used to affect it before we changed how viewmodels work) + + if (cl_bobcycle.value) + view->origin[0] = bob * 0.4; //and bob it forwards if (cl.items & IT_INVISIBILITY) // woods #ringalpha {