From 8bc2fa7b6c15fe173ab8e44c68e812c3ec114310 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Sat, 24 Mar 2018 08:13:33 -0400
Subject: [PATCH] Fix errors

---
 src/s_sound.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/s_sound.c b/src/s_sound.c
index b93eb972..7ea09e98 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1022,12 +1022,12 @@ void S_UpdateSounds(void)
 					if (splitscreen)
 					{
 						const mobj_t *soundmobj = c->origin;
-						fixed_t recdist;
+						fixed_t recdist = -1;
 						INT32 i, p = -1;
 
 						for (i = 0; i < 4; i++)
 						{
-							fixed_t thisdist;
+							fixed_t thisdist = -1;
 
 							if (i > splitscreen)
 								break;
@@ -1043,7 +1043,7 @@ void S_UpdateSounds(void)
 							else
 								continue;
 
-							if (recdist == NULL || (thisdist != NULL && thisdist < recdist))
+							if (recdist == -1 || (thisdist != -1 && thisdist < recdist))
 							{
 								recdist = thisdist;
 								p = i;
@@ -1052,13 +1052,7 @@ void S_UpdateSounds(void)
 
 						if (p != -1)
 						{
-							if (p == 0)
-							{
-								// Player 1 gets the sound
-								audible = S_AdjustSoundParams(listenmobj, c->origin, &volume, &sep, &pitch,
-									c->sfxinfo);
-							}
-							else if (p == 1)
+							if (p == 1)
 							{
 								// Player 2 gets the sound
 								audible = S_AdjustSoundParams(listenmobj2, c->origin, &volume, &sep, &pitch,
@@ -1076,6 +1070,12 @@ void S_UpdateSounds(void)
 								audible = S_AdjustSoundParams(listenmobj4, c->origin, &volume, &sep, &pitch,
 									c->sfxinfo);
 							}
+							else
+							{
+								// Player 1 gets the sound
+								audible = S_AdjustSoundParams(listenmobj, c->origin, &volume, &sep, &pitch,
+									c->sfxinfo);
+							}
 
 							if (audible)
 								I_UpdateSoundParams(c->handle, volume, sep, pitch);