From d3e4f9182412062b6a4f554f796699b66e9697ef Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Thu, 24 Jul 2025 23:19:03 -0400 Subject: [PATCH] More reversals to fix More reverals fixed, forgot wording on blurb --- src/d_clisrv.c | 4 ++-- src/d_netcmd.c | 2 +- src/menus/options-server-1.c | 2 +- src/menus/options-voice.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 8d0b8196f..dc4cb705f 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1088,7 +1088,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime) netbuffer->u.serverinfo.kartvars = (UINT8) ( (gamespeed & SV_SPEEDMASK) | (dedicated ? SV_DEDICATED : 0) | - (!cv_voice_allowservervoice.value ? SV_VOICEENABLED : 1) + (!cv_voice_allowservervoice.value ? SV_VOICEENABLED : 0) ); D_ParseCarets(netbuffer->u.serverinfo.servername, cv_servername.string, MAXSERVERNAME); @@ -5308,7 +5308,7 @@ static void PT_HandleVoiceServer(SINT8 node) if (cv_voice_allowservervoice.value != 0) { - // Don't even relay voice packets if voice_allowservervoice is on + // Don't even relay voice packets if voice_allowservervoice is off return; } diff --git a/src/d_netcmd.c b/src/d_netcmd.c index c372c62a9..13ddfca17 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1224,7 +1224,7 @@ void WeaponPref_Send(UINT8 ssplayer) if (cv_voice_selfmute.value) prefs |= WP_SELFMUTE; - if (!cv_voice_selfdeafen.value) + if (cv_voice_selfdeafen.value) prefs |= WP_SELFDEAFEN; } diff --git a/src/menus/options-server-1.c b/src/menus/options-server-1.c index a2b5b1e18..ac049dab9 100644 --- a/src/menus/options-server-1.c +++ b/src/menus/options-server-1.c @@ -89,7 +89,7 @@ menuitem_t OPTIONS_Server[] = {IT_HEADER, "Voice Chat...", NULL, NULL, {NULL}, 0, 0}, - {IT_STRING | IT_CVAR, "Server Voice Chat", "All voice chat will be disabled on your server.", + {IT_STRING | IT_CVAR, "Server Voice Chat", "All voice chat will be enabled on your server.", NULL, {.cvar = &cv_voice_allowservervoice}, 0, 0}, {IT_STRING | IT_CVAR, "Proximity Effects", "Player voices will be adjusted relative to you.", diff --git a/src/menus/options-voice.cpp b/src/menus/options-voice.cpp index 2e0624483..3e7d74d8d 100644 --- a/src/menus/options-voice.cpp +++ b/src/menus/options-voice.cpp @@ -40,7 +40,7 @@ menuitem_t OPTIONS_Voice[] = {IT_HEADER, "Server Voice Options...", NULL, NULL, {NULL}, 0, 0}, - {IT_STRING | IT_CVAR, "Server Voice Chat", "All voice chat will be disabled on your server.", + {IT_STRING | IT_CVAR, "Server Voice Chat", "All voice chat will be enabled on your server.", NULL, {.cvar = &cv_voice_allowservervoice}, 0, 0}, {IT_STRING | IT_CVAR, "Proximity Effects", "Player voices will be adjusted relative to you.",