Merge branch 'remove-surround' into 'master'

Remove surround sound cvar

See merge request KartKrew/Kart!1694
This commit is contained in:
James R. 2023-12-22 06:16:23 +00:00
commit 0d2844bc5a
3 changed files with 1 additions and 11 deletions

View file

@ -475,7 +475,6 @@ consvar_t precachesound = Player("precachesound", "Off").on_off();
// stereo reverse
consvar_t stereoreverse = Player("stereoreverse", "Off").on_off();
consvar_t surround = Player("surround", "Off").on_off();
//

View file

@ -26,9 +26,6 @@ menuitem_t OPTIONS_Sound[] =
{IT_STRING | IT_CVAR, "Reverse L/R Channels", "Reverse left & right channels for Stereo playback.",
NULL, {.cvar = &stereoreverse}, 0, 0},
{IT_STRING | IT_CVAR, "Surround", "Enables or disable Surround sound playback.",
NULL, {.cvar = &surround}, 0, 0},
{IT_SPACE | IT_NOTHING, NULL, NULL,
NULL, {NULL}, 0, 0},

View file

@ -533,7 +533,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
{
continue;
}
recdist = thisdist;
i = j;
}
@ -1036,12 +1036,6 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
if (reverse)
angle = InvAngle(angle);
#ifdef SURROUND
// Produce a surround sound for angle from 105 till 255
if (surround.value == 1 && (angle > ANG105 && angle < ANG255 ))
*sep = SURROUND_SEP;
else
#endif
{
angle >>= ANGLETOFINESHIFT;